diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix
index bec5ea04..c03ac67a 100644
--- a/nix/configurations/vanadium.nix
+++ b/nix/configurations/vanadium.nix
@@ -37,16 +37,18 @@ in
           };
 
           hostPlatform = system;
-          overlays = with (import ../overlays); [
-            agenix
-            disko
-            nur
-            wired-notify
-            emacs28 # removed, but I need it for PLFA!
-            nix-tree
+          overlays = map import [
+            ../overlays/agenix.nix
+            ../overlays/disko.nix
+            ../overlays/nur.nix
+            ../overlays/wired-notify.nix
+            ../overlays/nix-tree.nix
 
-            packages
-            (import ./vanadium/nixos/overlay.nix)
+            ../overlays/packages.nix
+            ./vanadium/nixos/overlay.nix
+
+            # removed, but I need it for PLFA!
+            ../overlays/pin-emacs28.nix
           ];
 
           # Set NIX_PATH and flake registry at the same time
diff --git a/nix/overlays/by-name/agenix/overlay.nix b/nix/overlays/agenix.nix
similarity index 54%
rename from nix/overlays/by-name/agenix/overlay.nix
rename to nix/overlays/agenix.nix
index e75b4bd9..571e8ddf 100644
--- a/nix/overlays/by-name/agenix/overlay.nix
+++ b/nix/overlays/agenix.nix
@@ -1,6 +1,6 @@
 let
-  sources = import ../../../sources.nix;
+  sources = import ../sources.nix;
 in
-  final: prev: {
+  final: _: {
     inherit (final.callPackage sources.agenix {}) agenix;
   }
diff --git a/nix/overlays/by-name.nix b/nix/overlays/by-name.nix
deleted file mode 100644
index 256b7ff4..00000000
--- a/nix/overlays/by-name.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-let
-  sources = import ../sources.nix;
-  lib = import (sources.nixpkgs + "/lib");
-in
-  lib.mapAttrs
-  (
-    name: _:
-      import (./by-name + "/${name}/overlay.nix")
-  )
-  (
-    lib.filterAttrs (_: type: type == "directory") (builtins.readDir ./by-name)
-  )
diff --git a/nix/overlays/by-name/emacs28/overlay.nix b/nix/overlays/by-name/emacs28/overlay.nix
deleted file mode 100644
index 6bb07768..00000000
--- a/nix/overlays/by-name/emacs28/overlay.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-let
-  sources = import ../../../sources.nix;
-in
-  _: _: {
-    emacs28 = let
-      pkgs = import sources.pin-emacs28 {};
-    in
-      pkgs.emacs;
-  }
diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix
deleted file mode 100644
index e9a740a0..00000000
--- a/nix/overlays/default.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-import ./by-name.nix
-// {packages = import ./packages.nix;}
diff --git a/nix/overlays/by-name/disko/overlay.nix b/nix/overlays/disko.nix
similarity index 77%
rename from nix/overlays/by-name/disko/overlay.nix
rename to nix/overlays/disko.nix
index 72755fb5..9c2a41f0 100644
--- a/nix/overlays/by-name/disko/overlay.nix
+++ b/nix/overlays/disko.nix
@@ -1,5 +1,5 @@
 let
-  sources = import ../../../sources.nix;
+  sources = import ../sources.nix;
 in
   final: _: {
     disko =
diff --git a/nix/overlays/by-name/nix-tree/overlay.nix b/nix/overlays/nix-tree.nix
similarity index 83%
rename from nix/overlays/by-name/nix-tree/overlay.nix
rename to nix/overlays/nix-tree.nix
index 124289ae..778eef6d 100644
--- a/nix/overlays/by-name/nix-tree/overlay.nix
+++ b/nix/overlays/nix-tree.nix
@@ -1,7 +1,7 @@
 # The one in nixpkgs doesn't work
 # Getting nix-tree: user error (Failed parsing nix path-info output.)
 let
-  sources = import ../../../sources.nix;
+  sources = import ../sources.nix;
 in
   final: _: {
     nix-tree = (import sources.nix-tree).packages.${final.system}.default;
diff --git a/nix/overlays/by-name/nur/overlay.nix b/nix/overlays/nur.nix
similarity index 71%
rename from nix/overlays/by-name/nur/overlay.nix
rename to nix/overlays/nur.nix
index 6d4c4ca4..82cb25e6 100644
--- a/nix/overlays/by-name/nur/overlay.nix
+++ b/nix/overlays/nur.nix
@@ -1,5 +1,5 @@
 let
-  sources = import ../../../sources.nix;
+  sources = import ../sources.nix;
 in
   _: prev: {
     nur = import sources.nur {
diff --git a/nix/overlays/pin-emacs28.nix b/nix/overlays/pin-emacs28.nix
new file mode 100644
index 00000000..ef61a025
--- /dev/null
+++ b/nix/overlays/pin-emacs28.nix
@@ -0,0 +1,6 @@
+let
+  sources = import ../sources.nix;
+in
+  _: _: {
+    emacs28 = (import sources.pin-emacs28 {}).emacs;
+  }
diff --git a/nix/overlays/by-name/pin-isabelle-2023/overlay.nix b/nix/overlays/pin-isabelle-2023.nix
similarity index 73%
rename from nix/overlays/by-name/pin-isabelle-2023/overlay.nix
rename to nix/overlays/pin-isabelle-2023.nix
index 3778370a..121e95c0 100644
--- a/nix/overlays/by-name/pin-isabelle-2023/overlay.nix
+++ b/nix/overlays/pin-isabelle-2023.nix
@@ -1,5 +1,5 @@
 let
-  sources = import ../../../sources.nix;
+  sources = import ../sources.nix;
 in
   _: _: {
     # Isabelle version 2023
diff --git a/nix/overlays/by-name/pin-wireshark/overlay.nix b/nix/overlays/pin-wireshark.nix
similarity index 79%
rename from nix/overlays/by-name/pin-wireshark/overlay.nix
rename to nix/overlays/pin-wireshark.nix
index 1280ecf6..f56c1258 100644
--- a/nix/overlays/by-name/pin-wireshark/overlay.nix
+++ b/nix/overlays/pin-wireshark.nix
@@ -1,5 +1,5 @@
 let
-  sources = import ../../../sources.nix;
+  sources = import ../sources.nix;
 in
   _: _: {
     # Wireshark bug
diff --git a/nix/overlays/by-name/wired-notify/overlay.nix b/nix/overlays/wired-notify.nix
similarity index 57%
rename from nix/overlays/by-name/wired-notify/overlay.nix
rename to nix/overlays/wired-notify.nix
index 81ec70c7..1d1a7081 100644
--- a/nix/overlays/by-name/wired-notify/overlay.nix
+++ b/nix/overlays/wired-notify.nix
@@ -1,4 +1,4 @@
 let
-  sources = import ../../../sources.nix;
+  sources = import ../sources.nix;
 in
   (import sources.wired-notify).overlays.default