diff --git a/lib/default.nix b/lib/default.nix
index f79f9281..49208255 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -47,7 +47,9 @@
     specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu system theme; };
     pkgs = import inputs.${repo} { 
       inherit system; 
-      config.allowUnfree = unfree; };
+      config.allowUnfree = unfree; 
+      hostPlatform = system;
+      };
 
     modules = [
         # Types are 'default', 'small', and 'minimal'
diff --git a/nixos/hosts/backups-rpi4/default.nix b/nixos/hosts/backups-rpi4/default.nix
index 93f9279f..2dcc1dc3 100644
--- a/nixos/hosts/backups-rpi4/default.nix
+++ b/nixos/hosts/backups-rpi4/default.nix
@@ -47,7 +47,6 @@
 
   swapDevices = [ ];
   networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
   networking.hostName = "backups-rpi4";
   #####################################################################################
diff --git a/nixos/hosts/framework-server/default.nix b/nixos/hosts/framework-server/default.nix
index 9d37de6b..1ca3c374 100644
--- a/nixos/hosts/framework-server/default.nix
+++ b/nixos/hosts/framework-server/default.nix
@@ -30,7 +30,6 @@
   boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
 
   networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix
index 1ee69af6..bb28a894 100644
--- a/nixos/hosts/nixos-desktop/default.nix
+++ b/nixos/hosts/nixos-desktop/default.nix
@@ -14,7 +14,6 @@
   boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
 
   networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   hardware.keyboard.zsa.enable = true;
diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix
index cf215b86..1108f40b 100644
--- a/nixos/hosts/nixos-framework/default.nix
+++ b/nixos/hosts/nixos-framework/default.nix
@@ -22,7 +22,6 @@
   # boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
 
   networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
   hardware.keyboard.zsa.enable = true;
   hardware.cpu.amd.updateMicrocode =  lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/nixos/hosts/nixos-iso-console/default.nix b/nixos/hosts/nixos-iso-console/default.nix
index d50d79f1..e3e024e4 100644
--- a/nixos/hosts/nixos-iso-console/default.nix
+++ b/nixos/hosts/nixos-iso-console/default.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, modulesPath, desktop, username, ... }: {
 
   networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   networking.hostName = "nixos-iso-console";
 
   networking.firewall.allowedTCPPorts = [ 22 ];
diff --git a/nixos/hosts/nixos-iso-desktop/default.nix b/nixos/hosts/nixos-iso-desktop/default.nix
index 756cbaff..b6783357 100644
--- a/nixos/hosts/nixos-iso-desktop/default.nix
+++ b/nixos/hosts/nixos-iso-desktop/default.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, modulesPath, desktop, username, ... }: {
 
   networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   networking.hostName = "nixos-iso-desktop";
 
   networking.firewall.allowedTCPPorts = [ 22 ];
diff --git a/nixos/hosts/nixos-rpi4-img/default.nix b/nixos/hosts/nixos-rpi4-img/default.nix
index 625617b8..388448cf 100644
--- a/nixos/hosts/nixos-rpi4-img/default.nix
+++ b/nixos/hosts/nixos-rpi4-img/default.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, modulesPath, system, ... }: {
   # Build this image with:
   # nix build .#nixosConfigurations.nixos-rpi4-img.config.system.build.sdImage
-  nixpkgs.buildPlatform.system = "x86_64-linux";
   
   # nixpkgs.crossSystem.system = "armv7l-linux";
   networking.hostName = "nixos-rpi4-img";
diff --git a/nixos/hosts/nuc-server/default.nix b/nixos/hosts/nuc-server/default.nix
index 522b0e81..c890f9bc 100644
--- a/nixos/hosts/nuc-server/default.nix
+++ b/nixos/hosts/nuc-server/default.nix
@@ -20,7 +20,6 @@
   boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
 
   networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
diff --git a/nixos/hosts/osaka-linode-01/default.nix b/nixos/hosts/osaka-linode-01/default.nix
index 773eb88c..3e007484 100644
--- a/nixos/hosts/osaka-linode-01/default.nix
+++ b/nixos/hosts/osaka-linode-01/default.nix
@@ -34,7 +34,6 @@
   nix.distributedBuilds = true;
 
   networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   time.timeZone = "Asia/Tokyo";
   networking.hostName = "osaka-linode-01";
 
diff --git a/nixos/hosts/piaware-rpi4/default.nix b/nixos/hosts/piaware-rpi4/default.nix
index 218f2843..f3f55246 100644
--- a/nixos/hosts/piaware-rpi4/default.nix
+++ b/nixos/hosts/piaware-rpi4/default.nix
@@ -48,7 +48,6 @@
 
   swapDevices = [ ];
   networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
   networking.hostName = "piaware-rpi4";
   #####################################################################################
diff --git a/nixos/hosts/quitman-rpi4/default.nix b/nixos/hosts/quitman-rpi4/default.nix
index da232344..96aed6f5 100644
--- a/nixos/hosts/quitman-rpi4/default.nix
+++ b/nixos/hosts/quitman-rpi4/default.nix
@@ -44,7 +44,6 @@
 
   swapDevices = [ ];
   networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
   networking.hostName = "quitman-rpi4";
   #####################################################################################