diff --git a/flake.nix b/flake.nix
index fb5f402..aa0f698 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,11 +13,10 @@
     self,
     ...
   }: let
-    system = "x86_64-linux";
     username = "opdavies";
 
-    mkNixos = import ./lib/nixos {inherit inputs self system username;};
-    mkWsl = import ./lib/wsl2 {inherit inputs self system username;};
+    mkNixos = import ./lib/nixos {inherit inputs self username;};
+    mkWsl = import ./lib/wsl2 {inherit inputs self username;};
   in
     flake-parts.lib.mkFlake {inherit inputs;} {
       systems = ["x86_64-linux"];
diff --git a/lib/nixos/configuration.nix b/lib/nixos/configuration.nix
index 212ff1e..3d9eaf3 100644
--- a/lib/nixos/configuration.nix
+++ b/lib/nixos/configuration.nix
@@ -1,7 +1,6 @@
 {
   inputs,
   desktop ? false,
-  system,
 }: {pkgs, ...}: let
   configure-gtk = pkgs.writeTextFile {
     name = "configure-gtk";
diff --git a/lib/nixos/default.nix b/lib/nixos/default.nix
index 0976f68..6d986fe 100644
--- a/lib/nixos/default.nix
+++ b/lib/nixos/default.nix
@@ -1,12 +1,11 @@
 {
   inputs,
   self,
-  system,
   username,
 }: {
   desktop ? false,
 }: let
-  configuration = import ./configuration.nix {inherit desktop inputs system;};
+  configuration = import ./configuration.nix {inherit desktop inputs;};
   hardwareConfiguration = import ./hardware-configuration.nix;
 in
   inputs.nixpkgs.lib.nixosSystem {
@@ -14,7 +13,7 @@ in
       inputs.home-manager.nixosModules.home-manager
       {
         home-manager = {
-          extraSpecialArgs = {inherit inputs desktop self system username;};
+          extraSpecialArgs = {inherit inputs desktop self username;};
           useGlobalPkgs = true;
           useUserPackages = true;
           users."${username}" = import ./home-manager;
diff --git a/lib/nixos/home-manager/default.nix b/lib/nixos/home-manager/default.nix
index 6554fca..74c0129 100644
--- a/lib/nixos/home-manager/default.nix
+++ b/lib/nixos/home-manager/default.nix
@@ -4,7 +4,6 @@
   inputs,
   pkgs,
   self,
-  system,
   username,
   ...
 }: let
@@ -12,7 +11,7 @@
   shared-config = import ../../shared/home-manager.nix {inherit inputs pkgs self username;};
   shared-packages = import ../../shared/home-manager-packages.nix {inherit inputs pkgs;};
 
-  pkgs-2311 = inputs.nixpkgs-2311.legacyPackages.${system};
+  pkgs-2311 = inputs.nixpkgs-2311.legacyPackages.${pkgs.system};
 in {
   imports =
     if desktop