diff --git a/changelog.txt b/changelog.txt
index 5b724f2..63eb06d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,5 @@
 TBA
+- Use fm.last.commons:lastcommons-lang:3.0.0 for Clock dependency
 - moved to Apache Commons pool commons-pool:commons-pool:1.6 (thanks @jeeZzzup)
 - Fix bug in MultiHostTrackerPool.getTracker() when host is unreachable it always tries the same host (thanks @igieon)
 - setTrackerSoTimeout -> setTrackerReadTimeout in SpringMojiBean
diff --git a/pom.xml b/pom.xml
index dce95c1..c5517d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,7 +240,12 @@
       <artifactId>commons-lang</artifactId>
       <version>2.1</version>
     </dependency>
-
+    <dependency>
+      <groupId>fm.last.commons</groupId>
+      <artifactId>lastcommons-lang</artifactId>
+      <version>3.0.0</version>
+    </dependency>
+    
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
diff --git a/src/main/java/fm/last/moji/time/Clock.java b/src/main/java/fm/last/moji/time/Clock.java
deleted file mode 100644
index 810a3f0..0000000
--- a/src/main/java/fm/last/moji/time/Clock.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package fm.last.moji.time;
-
-/**
- * Pluggable system clock.
- */
-public interface Clock {
-
-  long currentTimeMillis();
-
-}
diff --git a/src/main/java/fm/last/moji/time/SystemClock.java b/src/main/java/fm/last/moji/time/SystemClock.java
deleted file mode 100644
index 712f412..0000000
--- a/src/main/java/fm/last/moji/time/SystemClock.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package fm.last.moji.time;
-
-/**
- * {@link Clock} implementation that delegates to {@link System#currentTimeMillis()}.
- */
-public enum SystemClock implements Clock {
-  INSTANCE;
-
-  @Override
-  public long currentTimeMillis() {
-    return System.currentTimeMillis();
-  }
-
-}
diff --git a/src/main/java/fm/last/moji/tracker/pool/ManagedTrackerHost.java b/src/main/java/fm/last/moji/tracker/pool/ManagedTrackerHost.java
index 8ad8c97..22db1dd 100644
--- a/src/main/java/fm/last/moji/tracker/pool/ManagedTrackerHost.java
+++ b/src/main/java/fm/last/moji/tracker/pool/ManagedTrackerHost.java
@@ -27,8 +27,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fm.last.moji.time.Clock;
-import fm.last.moji.time.SystemClock;
+import fm.last.commons.lang.time.Clock;
 
 /**
  * Manages the status of a given tracker host. Knows when it last failed, when the last successful request occurred.
@@ -59,7 +58,7 @@ public class ManagedTrackerHost {
   }
 
   ManagedTrackerHost(InetSocketAddress address) {
-    this(address, new Timer(), SystemClock.INSTANCE);
+    this(address, new Timer(), Clock.INSTANCE);
   }
 
   /**
@@ -112,7 +111,7 @@ void markAsFailed() {
         resetTask.cancel();
       }
       log.debug("Scheduling reset of {} in {} {}", new Object[] { address, hostRetryInterval,
-          hostRetryIntervalTimeUnit.name().toLowerCase() });
+        hostRetryIntervalTimeUnit.name().toLowerCase() });
       resetTask = resetTaskFactory.newInstance();
       resetTimer.schedule(resetTask, hostRetryIntervalTimeUnit.toMillis(hostRetryInterval));
     }
diff --git a/src/test/java/fm/last/moji/tracker/pool/ManagedTrackerHostTest.java b/src/test/java/fm/last/moji/tracker/pool/ManagedTrackerHostTest.java
index c62353e..c538968 100644
--- a/src/test/java/fm/last/moji/tracker/pool/ManagedTrackerHostTest.java
+++ b/src/test/java/fm/last/moji/tracker/pool/ManagedTrackerHostTest.java
@@ -36,7 +36,7 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import fm.last.moji.time.Clock;
+import fm.last.commons.lang.time.Clock;
 import fm.last.moji.tracker.pool.ManagedTrackerHost.ResetTask;
 
 @RunWith(MockitoJUnitRunner.class)