diff --git a/lib/fudo/host-filesystems.nix b/lib/fudo/host-filesystems.nix
index 5958ee2..7ba613d 100644
--- a/lib/fudo/host-filesystems.nix
+++ b/lib/fudo/host-filesystems.nix
@@ -12,7 +12,7 @@ in {
           (fs: opts: { filesystem = fs; opts = opts; })
           host-filesystems;
 
-        mounts = concatMap
+        mounts = builtins.listToAttrs (concatMap
           (fs: mapAttrsToList
             (mp: mp-opts:
               nameValuePair "${fs.filesystem}-${mp}-mount" {
@@ -25,7 +25,7 @@ in {
                 requires = [ "${fs.filesystem}-decrypt.service" ];
               })
             fs.opts.mountpoints)
-          filesystems;
+          filesystems);
       in mounts;
 
       services = mapAttrs' (filesystem-name: opts:
diff --git a/lib/types/host.nix b/lib/types/host.nix
index 889a054..1257bc5 100644
--- a/lib/types/host.nix
+++ b/lib/types/host.nix
@@ -15,6 +15,8 @@ rec {
           type = listOf str;
           description = "List of filesystem options specific to this mountpoint (eg: subvol).";
         };
+
+        # TODO: Access control. Group? List of users?
       };
     };
   in {