diff --git a/knotserver/ingester.go b/knotserver/ingester.go
index 8452c518..e77c1ca9 100644
--- a/knotserver/ingester.go
+++ b/knotserver/ingester.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"net/url"
 	"path/filepath"
+	"strings"
 
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
 	"github.com/bluesky-social/indigo/atproto/syntax"
@@ -21,6 +22,7 @@ import (
 	knotxrpc "tangled.org/core/knotserver/xrpc"
 	"tangled.org/core/log"
 	"tangled.org/core/rbac"
+	"tangled.org/core/tid"
 	"tangled.org/core/workflow"
 )
 
@@ -356,7 +358,7 @@ func (h *Knot) processPull(ctx context.Context, event *jmodels.Event) error {
 	}
 
 	ev := db.Event{
-		Rkey:      TID(),
+		Rkey:      tid.TID(),
 		Nsid:      tangled.PipelineNSID,
 		EventJson: string(eventJson),
 	}
diff --git a/knotserver/internal.go b/knotserver/internal.go
index 2fc669a6..6b687197 100644
--- a/knotserver/internal.go
+++ b/knotserver/internal.go
@@ -25,6 +25,7 @@ import (
 	"tangled.org/core/log"
 	"tangled.org/core/notifier"
 	"tangled.org/core/rbac"
+	"tangled.org/core/tid"
 	"tangled.org/core/workflow"
 )
 
@@ -312,7 +313,7 @@ func (h *InternalHandle) insertRefUpdate(line git.PostReceiveLine, gitUserDid, o
 	}
 
 	event := db.Event{
-		Rkey:      TID(),
+		Rkey:      tid.TID(),
 		Nsid:      tangled.GitRefUpdateNSID,
 		EventJson: string(eventJson),
 	}
@@ -416,7 +417,7 @@ func (h *InternalHandle) triggerPipeline(
 	}
 
 	event := db.Event{
-		Rkey:      TID(),
+		Rkey:      tid.TID(),
 		Nsid:      tangled.PipelineNSID,
 		EventJson: string(eventJson),
 	}
diff --git a/knotserver/util.go b/knotserver/util.go
deleted file mode 100644
index 54fa1fce..00000000
--- a/knotserver/util.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package knotserver
-
-import (
-	"github.com/bluesky-social/indigo/atproto/syntax"
-)
-
-var TIDClock = syntax.NewTIDClock(0)
-
-func TID() string {
-	return TIDClock.Next().String()
-}