diff --git a/cmd/gosky/admin.go b/cmd/gosky/admin.go
index b1914c4fb..769577e5e 100644
--- a/cmd/gosky/admin.go
+++ b/cmd/gosky/admin.go
@@ -29,6 +29,10 @@ var adminCmd = &cli.Command{
 			EnvVars:  []string{"ATP_AUTH_ADMIN_PASSWORD"},
 			Required: true,
 		},
+		&cli.StringFlag{
+			Name:  "admin-endpoint",
+			Value: "https://mod.bsky.app",
+		},
 	},
 	Subcommands: []*cli.Command{
 		buildInviteTreeCmd,
@@ -78,7 +82,7 @@ var checkUserCmd = &cli.Command{
 
 		adminKey := cctx.String("admin-password")
 		xrpcc.AdminToken = &adminKey
-		xrpcc.Host = id.PDSEndpoint()
+		xrpcc.Host = cctx.String("admin-endpoint")
 
 		rep, err := toolsozone.ModerationGetRepo(ctx, xrpcc, did)
 		if err != nil {
@@ -623,25 +627,25 @@ var takeDownAccountCmd = &cli.Command{
 
 		for _, did := range cctx.Args().Slice() {
 			if !strings.HasPrefix(did, "did:") {
-				phr := &api.ProdHandleResolver{}
-				resp, err := phr.ResolveHandleToDid(ctx, did)
+				dir := identity.DefaultDirectory()
+				resp, err := dir.LookupHandle(ctx, syntax.Handle(did))
 				if err != nil {
 					return err
 				}
 
-				did = resp
+				did = resp.DID.String()
 			}
 
 			reason := cctx.String("reason")
 			adminUser := cctx.String("admin-user")
 			if !strings.HasPrefix(adminUser, "did:") {
-				phr := &api.ProdHandleResolver{}
-				resp, err := phr.ResolveHandleToDid(ctx, adminUser)
+				dir := identity.DefaultDirectory()
+				resp, err := dir.LookupHandle(ctx, syntax.Handle(adminUser))
 				if err != nil {
 					return err
 				}
 
-				adminUser = resp
+				adminUser = resp.DID.String()
 			}
 
 			resp, err := toolsozone.ModerationEmitEvent(ctx, xrpcc, &toolsozone.ModerationEmitEvent_Input{
diff --git a/cmd/gosky/handle.go b/cmd/gosky/handle.go
index c0c7e2e6c..ae32ab801 100644
--- a/cmd/gosky/handle.go
+++ b/cmd/gosky/handle.go
@@ -4,8 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	api "github.com/bluesky-social/indigo/api"
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
+	"github.com/bluesky-social/indigo/atproto/identity"
+	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/bluesky-social/indigo/util/cliutil"
 
 	cli "github.com/urfave/cli/v2"
@@ -30,15 +31,20 @@ var resolveHandleCmd = &cli.Command{
 		if err != nil {
 			return err
 		}
-		handle := args[0]
 
-		phr := &api.ProdHandleResolver{}
-		out, err := phr.ResolveHandleToDid(ctx, handle)
+		h, err := syntax.ParseHandle(args[0])
+		if err != nil {
+			return fmt.Errorf("resolving %q: %w", args[0], err)
+		}
+
+		dir := identity.DefaultDirectory()
+
+		res, err := dir.LookupHandle(ctx, h)
 		if err != nil {
 			return err
 		}
 
-		fmt.Println(out)
+		fmt.Println(res.DID)
 
 		return nil
 	},
diff --git a/cmd/gosky/main.go b/cmd/gosky/main.go
index 028cd0196..6a3cfabd4 100644
--- a/cmd/gosky/main.go
+++ b/cmd/gosky/main.go
@@ -765,7 +765,7 @@ var listLabelsCmd = &cli.Command{
 		since := time.Now().Add(-1 * delta).UnixMilli()
 
 		xrpcc := &xrpc.Client{
-			Host: "https://api.bsky.app",
+			Host: "https://mod.bsky.app",
 		}
 
 		for {