diff --git a/flake.nix b/flake.nix
index 443055e..8265813 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,8 +28,6 @@
     deploy-rs,
     flake-utils,
     nixpkgs,
-    nixpkgs-stable,
-    nixpkgs-unstable,
     ...
   }:
     {
@@ -42,25 +40,9 @@
     }
     // flake-utils.lib.eachDefaultSystem (
       system: let
-        pkgsStable = import nixpkgs-stable {
-          inherit system;
-        };
-
-        pkgsUnstable = import nixpkgs-unstable {
-          inherit system;
-        };
-
         pkgs = import nixpkgs {
           inherit system;
           overlays = [
-            (_: _: pkgsStable) # Overlay latest packages from "stable" upstream release channel
-            (_: _: {
-              # Overlay some latest packages from "unstable" upstream release channel
-              inherit
-                (pkgsUnstable)
-                linux-firmware
-                ;
-            })
             self.overlays.default
           ];
         };
diff --git a/nixosModules/common.nix b/nixosModules/common.nix
index a25a450..35dd827 100644
--- a/nixosModules/common.nix
+++ b/nixosModules/common.nix
@@ -23,6 +23,10 @@ with lib; {
   nix.requireSignedBinaryCaches = true;
   nix.settings.auto-optimise-store = true;
 
+  nixpkgs.overlays = [
+    self.overlays.nixpkgs
+  ];
+
   programs.neovim.defaultEditor = mkDefault true;
   programs.neovim.viAlias = mkDefault true;
   programs.neovim.vimAlias = mkDefault true;
diff --git a/nixosModules/service.nix b/nixosModules/service.nix
index 60a0d1f..ab7211f 100644
--- a/nixosModules/service.nix
+++ b/nixosModules/service.nix
@@ -55,7 +55,9 @@ in {
         users.root.name
       ];
 
-      nixpkgs.overlays = [self.overlays.service];
+      nixpkgs.overlays = [
+        self.overlays.service
+      ];
 
       profian.users.deploy.enable = true;
       profian.users.haraldh.enable = true;
diff --git a/overlays/default.nix b/overlays/default.nix
index c46cbeb..851c5ea 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,8 +1,10 @@
 inputs @ {nixlib, ...}: rec {
   service = import ./service.nix inputs;
   tooling = import ./tooling inputs;
+  nixpkgs = import ./nixpkgs.nix inputs;
 
   default = nixlib.lib.composeManyExtensions [
+    nixpkgs
     service
     tooling
   ];
diff --git a/overlays/nixpkgs.nix b/overlays/nixpkgs.nix
new file mode 100644
index 0000000..174b6c4
--- /dev/null
+++ b/overlays/nixpkgs.nix
@@ -0,0 +1,16 @@
+{
+  nixlib,
+  nixpkgs-stable,
+  nixpkgs-unstable,
+  ...
+}:
+nixlib.lib.composeManyExtensions [
+  (final: _: nixpkgs-stable.legacyPackages.${final.system}) # Overlay latest packages from "stable" upstream release channel
+  (final: _: {
+    # Overlay some latest packages from "unstable" upstream release channel
+    inherit
+      (nixpkgs-unstable.legacyPackages.${final.system})
+      linux-firmware
+      ;
+  })
+]