diff --git a/cloud/agent/BUILD.bazel b/cloud/agent/BUILD.bazel
index 6f5ce82..e228ca4 100644
--- a/cloud/agent/BUILD.bazel
+++ b/cloud/agent/BUILD.bazel
@@ -19,16 +19,16 @@
         "//metropolis/node/build/mkimage/osimage",
         "//metropolis/node/core/devmgr",
         "//metropolis/node/core/network",
-        "//metropolis/pkg/blockdev",
-        "//metropolis/pkg/bootparam",
-        "//metropolis/pkg/efivarfs",
-        "//metropolis/pkg/logtree",
-        "//metropolis/pkg/nvme",
-        "//metropolis/pkg/pki",
-        "//metropolis/pkg/scsi",
-        "//metropolis/pkg/smbios",
-        "//metropolis/pkg/supervisor",
         "//net/proto",
+        "//osbase/blockdev",
+        "//osbase/bootparam",
+        "//osbase/efivarfs",
+        "//osbase/logtree",
+        "//osbase/nvme",
+        "//osbase/pki",
+        "//osbase/scsi",
+        "//osbase/smbios",
+        "//osbase/supervisor",
         "@com_github_cenkalti_backoff_v4//:backoff",
         "@com_github_mdlayher_ethtool//:ethtool",
         "@com_github_vishvananda_netlink//:netlink",
diff --git a/cloud/agent/agent.go b/cloud/agent/agent.go
index 8efafd0..e014ac0 100644
--- a/cloud/agent/agent.go
+++ b/cloud/agent/agent.go
@@ -22,8 +22,8 @@
 	bpb "source.monogon.dev/cloud/bmaas/server/api"
 	"source.monogon.dev/metropolis/node/core/devmgr"
 	"source.monogon.dev/metropolis/node/core/network"
-	"source.monogon.dev/metropolis/pkg/pki"
-	"source.monogon.dev/metropolis/pkg/supervisor"
+	"source.monogon.dev/osbase/pki"
+	"source.monogon.dev/osbase/supervisor"
 )
 
 // This is similar to rpc.NewEphemeralCredentials, but that only deals with
diff --git a/cloud/agent/e2e/BUILD.bazel b/cloud/agent/e2e/BUILD.bazel
index d05031b..f903386 100644
--- a/cloud/agent/e2e/BUILD.bazel
+++ b/cloud/agent/e2e/BUILD.bazel
@@ -12,8 +12,8 @@
     deps = [
         "//cloud/agent/api",
         "//cloud/bmaas/server/api",
-        "//metropolis/pkg/pki",
         "//metropolis/proto/api",
+        "//osbase/pki",
         "@com_github_cavaliergopher_cpio//:cpio",
         "@com_github_klauspost_compress//zstd",
         "@io_bazel_rules_go//go/runfiles:go_default_library",
diff --git a/cloud/agent/e2e/main_test.go b/cloud/agent/e2e/main_test.go
index 3a27803..ec1ee0c 100644
--- a/cloud/agent/e2e/main_test.go
+++ b/cloud/agent/e2e/main_test.go
@@ -30,8 +30,8 @@
 
 	apb "source.monogon.dev/cloud/agent/api"
 	bpb "source.monogon.dev/cloud/bmaas/server/api"
-	"source.monogon.dev/metropolis/pkg/pki"
 	mpb "source.monogon.dev/metropolis/proto/api"
+	"source.monogon.dev/osbase/pki"
 )
 
 type fakeServer struct {
diff --git a/cloud/agent/hwreport.go b/cloud/agent/hwreport.go
index 33a7149..da50749 100644
--- a/cloud/agent/hwreport.go
+++ b/cloud/agent/hwreport.go
@@ -18,9 +18,9 @@
 	"golang.org/x/sys/unix"
 
 	"source.monogon.dev/cloud/agent/api"
-	"source.monogon.dev/metropolis/pkg/nvme"
-	"source.monogon.dev/metropolis/pkg/scsi"
-	"source.monogon.dev/metropolis/pkg/smbios"
+	"source.monogon.dev/osbase/nvme"
+	"source.monogon.dev/osbase/scsi"
+	"source.monogon.dev/osbase/smbios"
 )
 
 type hwReportContext struct {
diff --git a/cloud/agent/install.go b/cloud/agent/install.go
index 126d365..6082337 100644
--- a/cloud/agent/install.go
+++ b/cloud/agent/install.go
@@ -15,10 +15,10 @@
 
 	bpb "source.monogon.dev/cloud/bmaas/server/api"
 	"source.monogon.dev/metropolis/node/build/mkimage/osimage"
-	"source.monogon.dev/metropolis/pkg/blockdev"
-	"source.monogon.dev/metropolis/pkg/efivarfs"
-	"source.monogon.dev/metropolis/pkg/logtree"
 	npb "source.monogon.dev/net/proto"
+	"source.monogon.dev/osbase/blockdev"
+	"source.monogon.dev/osbase/efivarfs"
+	"source.monogon.dev/osbase/logtree"
 )
 
 //go:embed metropolis/node/core/abloader/abloader_bin.efi
diff --git a/cloud/agent/main.go b/cloud/agent/main.go
index 45c3e52..511e688 100644
--- a/cloud/agent/main.go
+++ b/cloud/agent/main.go
@@ -8,9 +8,9 @@
 
 	"golang.org/x/sys/unix"
 
-	"source.monogon.dev/metropolis/pkg/bootparam"
-	"source.monogon.dev/metropolis/pkg/logtree"
-	"source.monogon.dev/metropolis/pkg/supervisor"
+	"source.monogon.dev/osbase/bootparam"
+	"source.monogon.dev/osbase/logtree"
+	"source.monogon.dev/osbase/supervisor"
 )
 
 var validTTYRegexp = regexp.MustCompile(`^[a-zA-Z0-9]+$`)
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
diff --git a/cloud/lib/component/BUILD.bazel b/cloud/lib/component/BUILD.bazel
index 71c1ab4..2714ef3 100644
--- a/cloud/lib/component/BUILD.bazel
+++ b/cloud/lib/component/BUILD.bazel
@@ -10,7 +10,7 @@
     importpath = "source.monogon.dev/cloud/lib/component",
     visibility = ["//visibility:public"],
     deps = [
-        "//metropolis/pkg/pki",
+        "//osbase/pki",
         "@com_github_adrg_xdg//:xdg",
         "@com_github_cockroachdb_cockroach_go_v2//testserver",
         "@com_github_golang_migrate_migrate_v4//:migrate",
diff --git a/cloud/lib/component/devcerts.go b/cloud/lib/component/devcerts.go
index 32d809c..2a5f60a 100644
--- a/cloud/lib/component/devcerts.go
+++ b/cloud/lib/component/devcerts.go
@@ -13,7 +13,7 @@
 
 	"k8s.io/klog/v2"
 
-	"source.monogon.dev/metropolis/pkg/pki"
+	"source.monogon.dev/osbase/pki"
 )
 
 // GetDevCerts returns paths to this component's development certificate, key