diff --git a/shim/.buckconfig b/shim/.buckconfig
index 682a01cfb5..971b77525c 100644
--- a/shim/.buckconfig
+++ b/shim/.buckconfig
@@ -11,7 +11,7 @@ fbcode = shim
 fbsource = shim
 fbcode_macros = shim
 bazel_skylib = shim
-buck = none
+buck = shim
 
 [external_cells]
 prelude = bundled
diff --git a/shim/PACKAGE b/shim/PACKAGE
index 782e6f913f..ea35fecd14 100644
--- a/shim/PACKAGE
+++ b/shim/PACKAGE
@@ -5,11 +5,8 @@
 # License, Version 2.0 found in the LICENSE-APACHE file in the root directory
 # of this source tree.
 
-load(":cfg.bzl", "SHIM_ALIASES", "set_cfg_constructor", "get_shim_modifiers")
+load(":cfg.bzl", "get_shim_modifiers")
 load("@prelude//cfg/modifier:set_cfg_modifiers.bzl", "set_cfg_modifiers")
 
-# Activate cfg modifiers from CLI / PACKAGE / targets
-set_cfg_constructor(SHIM_ALIASES)
-
 modifiers = get_shim_modifiers()
 set_cfg_modifiers(modifiers)
diff --git a/shim/shims.bzl b/shim/shims.bzl
index 5a03813b51..38770d7250 100644
--- a/shim/shims.bzl
+++ b/shim/shims.bzl
@@ -328,15 +328,15 @@ def rust_protobuf_library(
     build_env = build_env or {}
     build_env.update(
         {
-            "PROTOC": "$(exe buck//third-party/proto:protoc)",
-            "PROTOC_INCLUDE": "$(location buck//third-party/proto:google_protobuf)",
+            "PROTOC": "$(exe shim//third-party/proto:protoc)",
+            "PROTOC_INCLUDE": "$(location shim//third-party/proto:google_protobuf)",
         },
     )
 
     prelude.genrule(
         name = proto_name,
         srcs = protos + [
-            "buck//third-party/proto:google_protobuf",
+            "shim//third-party/proto:google_protobuf",
         ],
         out = ".",
         cmd = "$(exe :" + build_name + ")",