diff --git a/metropolis/pkg/scsi/BUILD.bazel b/metropolis/pkg/scsi/BUILD.bazel
index f307a97..9c00b26 100644
--- a/metropolis/pkg/scsi/BUILD.bazel
+++ b/metropolis/pkg/scsi/BUILD.bazel
@@ -10,7 +10,6 @@
         "scsi.go",
         "scsi_linux.go",
         "scsi_linux_defs.go",
-        "scsi_linux_defs1.go",
         "sensekeydata.go",
     ],
     cgo = True,
diff --git a/metropolis/pkg/tpm/BUILD.bazel b/metropolis/pkg/tpm/BUILD.bazel
index 4873a82..76bb8bd 100644
--- a/metropolis/pkg/tpm/BUILD.bazel
+++ b/metropolis/pkg/tpm/BUILD.bazel
@@ -12,11 +12,11 @@
         "//metropolis/pkg/logtree",
         "//metropolis/pkg/sysfs",
         "//metropolis/pkg/tpm/proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
         "@com_github_google_go_tpm//tpm2",
         "@com_github_google_go_tpm//tpmutil",
         "@com_github_google_go_tpm_tools//client",
         "@com_github_pkg_errors//:errors",
+        "@org_golang_google_protobuf//proto",
         "@org_golang_x_crypto//nacl/secretbox",
         "@org_golang_x_sys//unix",
     ],
diff --git a/metropolis/pkg/tpm/tpm.go b/metropolis/pkg/tpm/tpm.go
index 2a3f67a..7d45036 100644
--- a/metropolis/pkg/tpm/tpm.go
+++ b/metropolis/pkg/tpm/tpm.go
@@ -31,17 +31,18 @@
 	"sync"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	tpm2tools "github.com/google/go-tpm-tools/client"
 	"github.com/google/go-tpm/tpm2"
 	"github.com/google/go-tpm/tpmutil"
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/nacl/secretbox"
 	"golang.org/x/sys/unix"
+	"google.golang.org/protobuf/proto"
+
+	tpmpb "source.monogon.dev/metropolis/pkg/tpm/proto"
 
 	"source.monogon.dev/metropolis/pkg/logtree"
 	"source.monogon.dev/metropolis/pkg/sysfs"
-	tpmpb "source.monogon.dev/metropolis/pkg/tpm/proto"
 )
 
 var (