diff --git a/flake/nixosConfigurations.nix b/flake/nixosConfigurations.nix
index b00570c..5f4c874 100644
--- a/flake/nixosConfigurations.nix
+++ b/flake/nixosConfigurations.nix
@@ -10,9 +10,10 @@ let
     group ? null,
     modules ? [],
   }: let
-    localNixpkgs = nixpkgs.lib.attrByPath [ "nixpkgs-${name}" ] nixpkgs inputs;
-  in localNixpkgs.lib.nixosSystem {
+    localNixpkgs = import ./nixpkgs.nix inputs;
+  in nixpkgs.lib.nixosSystem {
     system = system;
+    pkgs = localNixpkgs.${system};
     modules = modules ++ [
       self.nixosModules.nixfilesInputs
       self.nixosModules.clerie
@@ -22,12 +23,6 @@ let
         # Set hostname
         networking.hostName = lib.mkDefault name;
 
-        # Apply overlays
-        nixpkgs.overlays = [
-          self.overlays.nixfilesInputs
-          self.overlays.clerie
-        ];
-
         /*
           Make the contents of the flake availiable to modules.
           Useful for having the monitoring server scraping the