diff --git a/cloud/agent/takeover/BUILD.bazel b/cloud/agent/takeover/BUILD.bazel
index 2727f19..49e12ac 100644
--- a/cloud/agent/takeover/BUILD.bazel
+++ b/cloud/agent/takeover/BUILD.bazel
@@ -16,10 +16,10 @@
     visibility = ["//visibility:private"],
     deps = [
         "//cloud/agent/api",
-        "//metropolis/pkg/bootparam",
-        "//metropolis/pkg/kexec",
         "//net/dump",
         "//net/proto",
+        "//osbase/bootparam",
+        "//osbase/kexec",
         "@com_github_cavaliergopher_cpio//:cpio",
         "@com_github_klauspost_compress//zstd",
         "@org_golang_google_protobuf//proto",
diff --git a/cloud/agent/takeover/e2e/BUILD.bazel b/cloud/agent/takeover/e2e/BUILD.bazel
index 1cdd840..2b9a200 100644
--- a/cloud/agent/takeover/e2e/BUILD.bazel
+++ b/cloud/agent/takeover/e2e/BUILD.bazel
@@ -10,8 +10,8 @@
     ],
     deps = [
         "//cloud/agent/api",
-        "//metropolis/pkg/fat32",
-        "//metropolis/pkg/freeport",
+        "//osbase/fat32",
+        "//osbase/freeport",
         "@com_github_pkg_sftp//:sftp",
         "@io_bazel_rules_go//go/runfiles:go_default_library",
         "@org_golang_google_protobuf//proto",
diff --git a/cloud/agent/takeover/e2e/main_test.go b/cloud/agent/takeover/e2e/main_test.go
index 6d489eb..a8c8686 100644
--- a/cloud/agent/takeover/e2e/main_test.go
+++ b/cloud/agent/takeover/e2e/main_test.go
@@ -22,8 +22,8 @@
 
 	"source.monogon.dev/cloud/agent/api"
 
-	"source.monogon.dev/metropolis/pkg/fat32"
-	"source.monogon.dev/metropolis/pkg/freeport"
+	"source.monogon.dev/osbase/fat32"
+	"source.monogon.dev/osbase/freeport"
 )
 
 func TestE2E(t *testing.T) {
diff --git a/cloud/agent/takeover/takeover.go b/cloud/agent/takeover/takeover.go
index 645b27e..ffc3a6e 100644
--- a/cloud/agent/takeover/takeover.go
+++ b/cloud/agent/takeover/takeover.go
@@ -32,10 +32,10 @@
 	"google.golang.org/protobuf/proto"
 
 	"source.monogon.dev/cloud/agent/api"
-	"source.monogon.dev/metropolis/pkg/bootparam"
-	"source.monogon.dev/metropolis/pkg/kexec"
 	netdump "source.monogon.dev/net/dump"
 	netapi "source.monogon.dev/net/proto"
+	"source.monogon.dev/osbase/bootparam"
+	"source.monogon.dev/osbase/kexec"
 )
 
 //go:embed third_party/linux/bzImage