diff --git a/home/dav/default.nix b/home/dav/default.nix
index a0bbc42..c3b607b 100644
--- a/home/dav/default.nix
+++ b/home/dav/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, stablePkgs, ... }:
+{ config, pkgs, ... }:
 
 let
   contacts = "${config.home.homeDirectory}/Contacts";
@@ -8,6 +8,5 @@ let
   };
 in {
   imports = [ ./common.nix ];
-  home.packages =
-    [ davsync pkgs.vdirsyncer stablePkgs.khal pkgs.khard pkgs.abook ];
+  home.packages = [ davsync pkgs.vdirsyncer pkgs.khal pkgs.khard pkgs.abook ];
 }
diff --git a/home/desktop-river/default.nix b/home/desktop-river/default.nix
index 9098f00..4136498 100644
--- a/home/desktop-river/default.nix
+++ b/home/desktop-river/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, stablePkgs, ... }:
+{ config, pkgs, ... }:
 
 let
   configure-gtk = let
diff --git a/home/maker/default.nix b/home/maker/default.nix
index b9f2bd0..b7262e8 100644
--- a/home/maker/default.nix
+++ b/home/maker/default.nix
@@ -1,13 +1,13 @@
-{ config, pkgs, stablePkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   home.packages = [
-    stablePkgs.esphome
+    pkgs.esphome
     pkgs.freecad
     pkgs.kicad-small
     pkgs.meshlab
     pkgs.openscad
-    stablePkgs.platformio
+    pkgs.platformio
     pkgs.printrun
     pkgs.slic3r
   ];
diff --git a/home/music/default.nix b/home/music/default.nix
index c3c3579..9e5f182 100644
--- a/home/music/default.nix
+++ b/home/music/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, stablePkgs, ... }:
+{ config, pkgs, ... }:
 
 #let
 #  ardour-windows-vst = pkgs.ardour.overrideAttrs (old: {
@@ -14,7 +14,7 @@
     pkgs.fluidsynth
     pkgs.haskellPackages.tidal
     pkgs.helm
-    stablePkgs.helvum
+    pkgs.helvum
     pkgs.hydrogen
     pkgs.jack2
     pkgs.lmms
diff --git a/home/nixos-common.nix b/home/nixos-common.nix
index 1ef3cdd..49aec0b 100644
--- a/home/nixos-common.nix
+++ b/home/nixos-common.nix
@@ -32,7 +32,12 @@
       });
     })
 
+    (self: super: { esphome = stablePkgs.esphome; })
+    (self: super: { helvum = stablePkgs.helvum; })
+    (self: super: { khal = stablePkgs.khal; })
+    (self: super: { platformio = stablePkgs.platformio; })
     (self: super: { river = stablePkgs.river; })
+    (self: super: { vagrant = stablePkgs.vagrant; })
 
   ];
 
@@ -208,7 +213,7 @@
     sassc
     shellcheck
     signify
-    stablePkgs.vagrant
+    vagrant
     unzip
     virt-manager
     virtiofsd
diff --git a/home/wine/default.nix b/home/wine/default.nix
index 672d818..af194a6 100644
--- a/home/wine/default.nix
+++ b/home/wine/default.nix
@@ -1,4 +1,4 @@
-{ config, inputs, pkgs, stablePkgs, ... }:
+{ config, inputs, pkgs, ... }:
 
 let
   wine = pkgs.wineWowPackages.stable;