diff --git a/flake.nix b/flake.nix
index c27ba09..2df23f3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,10 +7,11 @@
 
   outputs = { self, home-manager, nixpkgs, nixpkgs-unstable }:
     let
-      pkgs-unstable = nixpkgs-unstable.legacyPackages.x86_64-linux;
+      system = "x86_64-linux";
       commonModuleArgs = { pkgs, ... }: {
         _module.args.pkgs-unstable = import nixpkgs-unstable {
           inherit (pkgs.stdenv.targetPlatform) system;
+          overlays = [ (import ./overlay.nix) ];
           config.allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [
             "corefonts"
             "steam"
@@ -22,7 +23,7 @@
     in
     {
       nixosConfigurations.nixos-desktop = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
+        inherit system;
         specialArgs = { inherit nixpkgs; inherit nixpkgs-unstable; };
         modules =
           [
@@ -33,7 +34,6 @@
             ./users
             (
               {
-                nixpkgs.overlays = [ (import ./overlay.nix { }) ];
                 networking.hostName = "nixos-desktop";
                 # Allow to externally control MPD
                 networking.firewall.allowedTCPPorts = [ 6600 ];
@@ -47,7 +47,7 @@
       };
 
       nixosConfigurations.froidmpa-laptop = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
+        inherit system;
         specialArgs = { inherit nixpkgs; inherit nixpkgs-unstable; };
         modules =
           [
@@ -58,7 +58,6 @@
             ./users
             (
               {
-                nixpkgs.overlays = [ (import ./overlay.nix { }) ];
                 networking.hostName = "froidmpa-laptop";
 
                 nix.registry.nixpkgs.flake = nixpkgs;
diff --git a/overlay.nix b/overlay.nix
index 40d07ed..0c8894e 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,4 +1,3 @@
-{}:
 final: prev:
 {
   ncmpcpp = prev.ncmpcpp.override { visualizerSupport = true; };
diff --git a/users/default.nix b/users/default.nix
index 65a0b07..248d19b 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -14,10 +14,6 @@
       ./froidmpa/vscode.nix
     ];
 
-    nixpkgs = {
-      overlays = [ (import ../overlay.nix { }) ];
-    };
-
     xsession = {
       enable = true;
       windowManager.xmonad = {
@@ -300,7 +296,7 @@
     systemd.user.services.activitywatch = {
       Unit.Description = "Start ActivityWatch";
       Service.Type = "simple";
-      Service.ExecStart = "${pkgs.activitywatch-bin}/bin/aw-server";
+      Service.ExecStart = "${pkgs-unstable.activitywatch-bin}/bin/aw-server";
       Install.WantedBy = [ "default.target" ];
       Service.Restart = "on-failure";
       Service.RestartSec = 5;
@@ -308,7 +304,7 @@
     systemd.user.services.activitywatch-afk = {
       Unit.Description = "Start ActivityWatch AFK";
       Service.Type = "simple";
-      Service.ExecStart = "${pkgs.activitywatch-bin}/bin/aw-watcher-afk";
+      Service.ExecStart = "${pkgs-unstable.activitywatch-bin}/bin/aw-watcher-afk";
       Install.WantedBy = [ "default.target" ];
       Service.Restart = "on-failure";
       Service.RestartSec = 5;
@@ -316,7 +312,7 @@
     systemd.user.services.activitywatch-window = {
       Unit.Description = "Start ActivityWatch Window";
       Service.Type = "simple";
-      Service.ExecStart = "${pkgs.activitywatch-bin}/bin/aw-watcher-window";
+      Service.ExecStart = "${pkgs-unstable.activitywatch-bin}/bin/aw-watcher-window";
       Install.WantedBy = [ "default.target" ];
       Service.Restart = "on-failure";
       Service.RestartSec = 5;