diff --git a/apps/gui/default.nix b/apps/gui/default.nix
index 101e25fc341adb96b96a51eab61e0896aa575f57..805351ea28eab162145178ad57fb4af78cd58229 100644
--- a/apps/gui/default.nix
+++ b/apps/gui/default.nix
@@ -28,10 +28,10 @@       # IDEs
       jetbrains.goland
 
       # Flake overlays
-      jolheiser.gomodinit
-      jolheiser.imp
-      jolheiser.kv
-      jolheiser.tmpl
+      jolheiser.nur.gomodinit
+      jolheiser.nur.imp
+      jolheiser.nur.kv
+      jolheiser.nur.tmpl
     ];
   };
 }

diff --git a/apps/nogui/default.nix b/apps/nogui/default.nix
index 3d42c421416a6b8362ab4a869eca55cd4a1aa61b..aedda6808d1ebc1d81c23c0f68fd03385dfe92c2 100644
--- a/apps/nogui/default.nix
+++ b/apps/nogui/default.nix
@@ -41,10 +41,10 @@       alejandra
       gofumpt
 
       # Flake overlays
-      jolheiser.git-age
-      jolheiser.templ
+      jolheiser.nur.git-age
+      jolheiser.nur.templ
       tclip
-      jolheiser-helix
+      jolheiser.helix
     ];
     activation.report-changes = config.lib.dag.entryAnywhere ''
       ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff $oldGenPath $newGenPath

diff --git a/apps/nogui/nushell.nix b/apps/nogui/nushell.nix
index bdc3972a876c5f96c2bc1221fa3746029c16e451..843e9b7d2957f6c9860bc1b83097106a6e9251b6 100644
--- a/apps/nogui/nushell.nix
+++ b/apps/nogui/nushell.nix
@@ -23,8 +23,8 @@       use ${nu_scripts}/share/nu_scripts/custom-completions/glow/glow-completions.nu *
       use ${nu_scripts}/share/nu_scripts/custom-completions/just/just-completions.nu *
       use ${nu_scripts}/share/nu_scripts/custom-completions/nix/nix-completions.nu *
 
-      use ${jolheiser.kv}/share/kv-completions.nu *
-      use ${jolheiser.tmpl}/share/tmpl-completions.nu *
+      use ${jolheiser.nur.kv}/share/kv-completions.nu *
+      use ${jolheiser.nur.tmpl}/share/tmpl-completions.nu *
     '';
     extraEnv = ''
       $env.GOPATH = "${config.xdg.dataHome}/go"

diff --git a/flake.nix b/flake.nix
index 08ab5eeae5ada198a20b0313cafc06e31bd36782..1dcc51ee74b59a69d76aa3fa6830cae7d1cd9958 100644
--- a/flake.nix
+++ b/flake.nix
@@ -72,10 +72,12 @@         nur = import inputs.nur {
           nurpkgs = prev;
           pkgs = prev;
         };
-        jolheiser = inputs.jolheiser-nur.packages.${prev.system};
+        jolheiser = {
+          nur = inputs.jolheiser-nur.packages.${prev.system};
+          helix = inputs.helix.packages.${prev.system}.default;
+          website = inputs.website.packages.${prev.system}.default;
+        };
         tclip = inputs.tclip.packages.${prev.system}.tclip;
-        jolheiser-helix = inputs.helix.packages.${prev.system}.default;
-        jolheiser-website = inputs.website.packages.${prev.system}.default;
       })
       golink.overlay
     ];

diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix
index 8a73b15ee8474d949a1da28f68e7b6cd6cf13061..ca2cc9388f5cc268fd691fbfe8edd1453c75e96d 100644
--- a/machines/dragonwell/caddy.nix
+++ b/machines/dragonwell/caddy.nix
@@ -27,7 +27,7 @@             root * /srv/bennet/src
             file_server
           }
           handle {
-            root * ${pkgs.jolheiser-website}
+            root * ${pkgs.jolheiser.website}
             file_server
           }
         '';