diff --git a/home-manager/roles/chat.nix b/home-manager/roles/chat.nix
index 37da7531..3aa26bbd 100644
--- a/home-manager/roles/chat.nix
+++ b/home-manager/roles/chat.nix
@@ -1,8 +1,7 @@
 { pkgs, ... }:
 {
   home.packages = builtins.attrValues {
-    inherit (pkgs.unfree) discord;
-    inherit (pkgs) signal-desktop tdesktop dino element-desktop;
+    inherit (pkgs) discord signal-desktop tdesktop dino element-desktop;
     weechat = pkgs.writeShellScriptBin "weechat" "ssh -t hera 'tmux -L weechat attach'";
   };
 }
diff --git a/home-manager/roles/games.nix b/home-manager/roles/games.nix
index 0e9530e5..495328fc 100644
--- a/home-manager/roles/games.nix
+++ b/home-manager/roles/games.nix
@@ -46,13 +46,12 @@ in
   };
 
   home.packages = builtins.attrValues {
-    factorio = pkgs.unstableUnfree.factorio.override {
+    factorio = pkgs.factorio.override {
       username = "maralorn";
       token = import ../../nixos/machines/apollo/secret/factory.nix;
       experimental = true;
     };
-    inherit (pkgs.unfree) steam;
-    inherit (pkgs) minetest;
+    inherit (pkgs) steam minetest;
     inherit gw2run gw2setup wine;
   };
 }
diff --git a/home-manager/roles/laptop.nix b/home-manager/roles/laptop.nix
index 6cf24501..3e4d063b 100644
--- a/home-manager/roles/laptop.nix
+++ b/home-manager/roles/laptop.nix
@@ -39,13 +39,14 @@ in {
       activate-mode > /dev/null
     '';
 
-    inherit (pkgs.unfree) zoom-us skypeforlinux google-chrome;
     inherit (pkgs.gnome3) nautilus;
     inherit (pkgs.xorg) xbacklight;
     inherit (pkgs)
     # web
       chromium
 
+      zoom-us skypeforlinux google-chrome
+
       mumble upower speedtest-cli acpi
 
       anki
diff --git a/overlays/20-unfree.nix b/overlays/20-unfree.nix
index 094e5399..12489e37 100644
--- a/overlays/20-unfree.nix
+++ b/overlays/20-unfree.nix
@@ -1,8 +1,7 @@
 self: super:
-if super.config.allowUnfree or false then
-  { }
-else {
+let
   unfree = import self.sources.nixpkgs { config.allowUnfree = true; };
   unstableUnfree = import self.sources.unstable { config.allowUnfree = true; };
-  releaseUnfree = import self.sources.nixpkgs-release { config.allowUnfree = true; };
-}
+  releaseUnfree =
+    import self.sources.nixpkgs-release { config.allowUnfree = true; };
+in { inherit (unfree) discord factorio steam zoom-us skypeforlinux google-chrome; }