diff --git a/flake.nix b/flake.nix
index 3a31a02f..3f65fb2d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,7 +49,7 @@
           components = defaultProfileComponents ++
             toolchainFile.toolchain.components;
           targets = toolchainFile.toolchain.targets;
-          fenix = inputs.fenix.packages.${pkgs.pkgsBuildHost.system};
+          fenix = inputs.fenix.packages.${pkgs.stdenv.buildPlatform.system};
         in
           fenix.combine (builtins.map
             (target:
diff --git a/nix/modules/default/default.nix b/nix/modules/default/default.nix
index 034e7024..d6d8ac65 100644
--- a/nix/modules/default/default.nix
+++ b/nix/modules/default/default.nix
@@ -18,11 +18,11 @@ in
   options.services.grapevine = {
     enable = lib.mkEnableOption "grapevine";
     package = lib.mkPackageOption
-      inputs.self.packages.${pkgs.system}
+      inputs.self.packages.${pkgs.hostPlatform.system}
       "grapevine"
       {
         default = "default";
-        pkgsText = "inputs.grapevine.packages.\${pkgs.system}";
+        pkgsText = "inputs.grapevine.packages.\${pkgs.hostPlatform.system}";
       };
 
     settings = lib.mkOption {
diff --git a/nix/shell.nix b/nix/shell.nix
index 354edf7a..130d63e6 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -1,5 +1,6 @@
 # Keep sorted
-{ default
+{ buildPlatform
+, default
 , engage
 , inputs
 , jq
@@ -7,7 +8,6 @@
 , markdownlint-cli
 , mdbook
 , mkShell
-, system
 , toolchain
 }:
 
@@ -25,7 +25,7 @@ mkShell {
     #
     # This needs to come before `toolchain` in this list, otherwise
     # `$PATH` will have stable rustfmt instead.
-    inputs.fenix.packages.${system}.latest.rustfmt
+    inputs.fenix.packages.${buildPlatform.system}.latest.rustfmt
 
     # Keep sorted
     engage