diff --git a/nix/configuration/hosts/quark/hardware-configuration.nix b/nix/configuration/hosts/quark/hardware-configuration.nix
index d463cf9..3caa61f 100644
--- a/nix/configuration/hosts/quark/hardware-configuration.nix
+++ b/nix/configuration/hosts/quark/hardware-configuration.nix
@@ -31,6 +31,5 @@
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/nix/configuration/hosts/quark/optimized_build.nix b/nix/configuration/hosts/quark/optimized_build.nix
index 851201b..9cfb494 100644
--- a/nix/configuration/hosts/quark/optimized_build.nix
+++ b/nix/configuration/hosts/quark/optimized_build.nix
@@ -20,6 +20,14 @@
         system = "x86_64-linux";
       };
 
+      # Uncomment on of these to enable cross compiling:
+      # nixpkgs.buildPlatform = builtins.currentSystem;
+      # nixpkgs.buildPlatform = {
+      #   gcc.arch = "znver4";
+      #   gcc.tune = "znver4";
+      #   system = "x86_64-linux";
+      # };
+
       nixpkgs.overlays = [
         (
           final: prev:
diff --git a/nix/configuration/roles/emacs/default.nix b/nix/configuration/roles/emacs/default.nix
index 190a8d9..c4628a2 100644
--- a/nix/configuration/roles/emacs/default.nix
+++ b/nix/configuration/roles/emacs/default.nix
@@ -113,7 +113,7 @@ in
                 "doc"
                 "info"
               ];
-              buildInputs = [ final.makeWrapper ];
+              nativeBuildInputs = [ final.makeWrapper ];
               postBuild = ''
                 wrapProgram $out/bin/emacs --prefix PATH : ${
                   lib.makeBinPath [
diff --git a/nix/configuration/roles/kubernetes/default.nix b/nix/configuration/roles/kubernetes/default.nix
index d14f00a..bee0b72 100644
--- a/nix/configuration/roles/kubernetes/default.nix
+++ b/nix/configuration/roles/kubernetes/default.nix
@@ -33,7 +33,7 @@ let
     .overrideAttrs
       (old: {
         buildCommand = "${old.buildCommand}\n patchShebangs $out";
-        buildInputs = [ pkgs.makeWrapper ];
+        nativeBuildInputs = [ pkgs.makeWrapper ];
         postBuild = ''
           wrapProgram $out/bin/decrypt_k8s_secret --prefix PATH : ${
             lib.makeBinPath [
diff --git a/nix/configuration/roles/rust/default.nix b/nix/configuration/roles/rust/default.nix
index 1148f68..8482484 100644
--- a/nix/configuration/roles/rust/default.nix
+++ b/nix/configuration/roles/rust/default.nix
@@ -131,7 +131,7 @@ in
                 ++ [
                   prev.rustup
                 ];
-              buildInputs = [ pkgs.makeWrapper ];
+              nativeBuildInputs = [ pkgs.makeWrapper ];
             };
           })
         ];
diff --git a/nix/configuration/roles/vscode/default.nix b/nix/configuration/roles/vscode/default.nix
index 2ee79bc..9506bf2 100644
--- a/nix/configuration/roles/vscode/default.nix
+++ b/nix/configuration/roles/vscode/default.nix
@@ -22,6 +22,7 @@
       (lib.mkIf config.me.graphical {
         allowedUnfree = [
           "vscode"
+          "vscode-x86_64-unknown-linux-gnu-with-extensions"
           "vscode-with-extensions"
           "vscode-extension-ms-vscode-remote-remote-ssh"
         ];