diff --git a/hosts/default.nix b/hosts/default.nix
index 129d1cc..4750cc0 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -67,12 +67,8 @@ let
             nixpkgs.overlays =
               let
                 override = import ../pkgs/override.nix unstablePkgs;
-
-                overlay = pkg: final: prev: {
-                  "${pkg.pname}" = pkg;
-                };
               in
-              map overlay override;
+              [ override ];
           };
 
           local = import "${toString ./.}/${hostName}.nix";
diff --git a/pkgs/override.nix b/pkgs/override.nix
index 154d6a4..bf146e2 100644
--- a/pkgs/override.nix
+++ b/pkgs/override.nix
@@ -1,16 +1,17 @@
-# Packages in this list are imported by hosts/default.nix, and are pulled from
+# Packages inherited are imported in hosts/default.nix, and are pulled from
 # nixpkgs master instead of the default nixos release. This doesn't actually
 # install them, just creates an overlay to pull them from master if they are
 # installed by the user elsewhere in the configuration.
-pkgs:
-with pkgs;
-[
-  starship
-  element-desktop
-  discord
-  signal-desktop
-  dhall
-  nixpkgs-fmt
-  manix
-  qutebrowser
-]
+pkgs: final: prev:
+{
+  inherit (pkgs)
+    dhall
+    discord
+    element-desktop
+    manix
+    nixpkgs-fmt
+    qutebrowser
+    signal-desktop
+    starship;
+
+}