diff --git a/flake.nix b/flake.nix
index 1c1e319..168fd86 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,10 +18,8 @@
     # Native VM config.
     riversong = nixpkgs.lib.nixosSystem {
       inherit pkgs;
-      modules = [
-        ./configuration.nix
+      modules = (builtins.attrValues self.nixosModules) ++ [
         ./platforms/riversong.nix
-        { nix.registry.nixpkgs.flake = inputs.nixpkgs; }
       ];
     };
     in rec {
@@ -43,13 +41,20 @@
         ];
       };
       # Modules for colmena and sd card image are the same.
-      modules = [
-        ./configuration.nix
-        ./platforms/melodypond.nix
-        inputs.nixos-hardware.nixosModules.raspberry-pi-4
-        { nix.registry.nixpkgs.flake = inputs.nixpkgs; }
+      modules = (builtins.attrValues self.nixosModules) ++ [
+          ./platforms/melodypond.nix
+          inputs.nixos-hardware.nixosModules.raspberry-pi-4
       ];
     in {
+      nixosModules = {
+        flakeAliases = {
+          nix.registry = {
+            nixpkgs.flake = nixpkgs;
+            nixconf.flake = self;
+          };
+        };
+        default = import ./configuration.nix;
+      };
       # Colmena deploy manifest
       colmena = {
         meta.nixpkgs = pkgs;