diff --git a/configuration.nix b/configuration.nix
index b3cc5d9..9387981 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,6 +6,8 @@
     "flakes"
   ];
 
+  nix.registry.nixpkgs.flake = inputs.nixpkgs;
+
   # Bootloader.
   boot.loader = {
     efi.canTouchEfiVariables = true;
diff --git a/flake.nix b/flake.nix
index 6f48a3f..b518ae1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,9 @@
       };
       laptop-x11 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        specialArgs = let inputs.x11mode = true; in { inherit inputs; };
+        specialArgs = {
+          inputs = inputs // { x11mode = true; };
+        };
         modules = [
           ./configuration.nix
           ./hardware_configuration.nix
@@ -28,7 +30,9 @@
       };
       laptop-wayland = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        specialArgs = let inputs.x11mode = false; in { inherit inputs; };
+        specialArgs = {
+          inputs = inputs // { x11mode = false; };
+        };
         modules = [
           ./configuration.nix
           ./hardware_configuration.nix