diff --git a/go/src/v.io/x/lock/lock/main.go b/go/src/v.io/x/lock/lock/main.go
index 4ffe673..8bbe90f 100644
--- a/go/src/v.io/x/lock/lock/main.go
+++ b/go/src/v.io/x/lock/lock/main.go
@@ -24,7 +24,6 @@
 	"v.io/x/lock"
 	"v.io/x/lock/locklib"
 	"v.io/x/ref/lib/v23cmd"
-	"v.io/x/ref/lib/xrpc"
 	_ "v.io/x/ref/runtime/factories/static"
 )
 
@@ -358,7 +357,7 @@
 		env:    env,
 		notify: make(chan error),
 	}
-	server, err := xrpc.NewServer(ctx, recvKeySuffix, service, security.AllowEveryone())
+	_, server, err := v23.WithNewServer(ctx, recvKeySuffix, service, security.AllowEveryone())
 	if err != nil {
 		return fmt.Errorf("failed to create server to receive keys: %v", err)
 	}
diff --git a/go/src/v.io/x/lock/lockd/starter.go b/go/src/v.io/x/lock/lockd/starter.go
index 0be2c4e..bb85543 100644
--- a/go/src/v.io/x/lock/lockd/starter.go
+++ b/go/src/v.io/x/lock/lockd/starter.go
@@ -12,10 +12,8 @@
 	"v.io/v23/context"
 	"v.io/v23/naming"
 	"v.io/v23/security"
-
 	"v.io/x/lib/vlog"
 	"v.io/x/lock/locklib"
-	"v.io/x/ref/lib/xrpc"
 )
 
 var unclaimedLockNhSuffix = "unclaimed-lock-" + fmt.Sprintf("%d", rand.Intn(1000000))
@@ -60,7 +58,7 @@
 		return nil, nil, err
 	}
 	claimed := make(chan struct{})
-	server, err := xrpc.NewServer(ctx, lockObjectName(ctx), newUnclaimedLock(claimed, configDir), security.AllowEveryone())
+	_, server, err := v23.WithNewServer(ctx, lockObjectName(ctx), newUnclaimedLock(claimed, configDir), security.AllowEveryone())
 	if err != nil {
 		stopMT()
 		return nil, nil, err
@@ -90,7 +88,7 @@
 		stopMT()
 		return nil, err
 	}
-	server, err := xrpc.NewServer(ctx, lockObjectName(ctx), newLock(), security.DefaultAuthorizer())
+	_, server, err := v23.WithNewServer(ctx, lockObjectName(ctx), newLock(), security.DefaultAuthorizer())
 	if err != nil {
 		stopMT()
 		return nil, err