diff --git a/configs/flake-parts/home-manager.nix b/configs/flake-parts/home-manager.nix
index c7d4e131..b44db885 100644
--- a/configs/flake-parts/home-manager.nix
+++ b/configs/flake-parts/home-manager.nix
@@ -11,22 +11,24 @@
     configs = {
       # The typical user in desktop environments.
       foo-dogsquared = {
-        nixpkgsBranch = "nixos-unstable";
+        nixpkgs = {
+          branch = "nixos-unstable";
+          overlays = [
+            # Neovim nightly!
+            inputs.neovim-nightly-overlay.overlays.default
+
+            # Emacs unstable version!
+            inputs.emacs-overlay.overlays.default
+
+            # Helix master!
+            inputs.helix-editor.overlays.default
+
+            # Get all of the NUR.
+            inputs.nur.overlay
+          ];
+        };
         homeManagerBranch = "home-manager-unstable";
         systems = [ "aarch64-linux" "x86_64-linux" ];
-        overlays = [
-          # Neovim nightly!
-          inputs.neovim-nightly-overlay.overlays.default
-
-          # Emacs unstable version!
-          inputs.emacs-overlay.overlays.default
-
-          # Helix master!
-          inputs.helix-editor.overlays.default
-
-          # Get all of the NUR.
-          inputs.nur.overlay
-        ];
         modules = [
           inputs.nur.hmModules.nur
           inputs.sops-nix.homeManagerModules.sops
diff --git a/configs/flake-parts/nixos.nix b/configs/flake-parts/nixos.nix
index 1dd5f414..5652fd78 100644
--- a/configs/flake-parts/nixos.nix
+++ b/configs/flake-parts/nixos.nix
@@ -61,7 +61,7 @@
       # TODO: Remove extra newlines that are here for whatever reason.
       #{{{
       void = {
-        nixpkgsBranch = "nixos-unstable";
+        nixpkgs.branch = "nixos-unstable";
         systems = [ "x86_64-linux" ];
         formats = [ "vm" ];
       };
@@ -69,14 +69,14 @@
 
       # The barely customized non-graphical installer.
       bootstrap = {
+        nixpkgs.branch = "nixos-unstable-small";
         systems = [ "aarch64-linux" "x86_64-linux" ];
         formats = [ "install-iso" ];
-        nixpkgsBranch = "nixos-unstable-small";
       };
 
       # The barely customized graphical installer.
       graphical-installer = {
-        nixpkgsBranch = "nixos-unstable";
+        nixpkgs.branch = "nixos-unstable";
         systems = [ "aarch64-linux" "x86_64-linux" ];
         formats = [ "install-iso-graphical" ];
         diskoConfigs = [ "external-hdd" ];
@@ -85,12 +85,14 @@
 
       # The WSL system (that is yet to be used).
       winnowing = {
-        nixpkgsBranch = "nixos-unstable";
+        nixpkgs = {
+          branch = "nixos-unstable";
+          overlays = [
+            inputs.neovim-nightly-overlay.overlays.default
+          ];
+        };
         systems = [ "x86_64-linux" ];
         formats = null;
-        overlays = [
-          inputs.neovim-nightly-overlay.overlays.default
-        ];
         modules = [
           # Well, well, well...
           inputs.nixos-wsl.nixosModules.default