diff --git a/modules/moritz/config/ai.nix b/modules/moritz/config/ai.nix
index aae43d0..25d824f 100644
--- a/modules/moritz/config/ai.nix
+++ b/modules/moritz/config/ai.nix
@@ -14,6 +14,7 @@ in
       prompts.api-key.type = "hidden";
       prompts.api-key.persist = true;
       share = true;
+      files.api-key.owner = "moritz";
     };
 
     clan.core.vars.generators.moritz-anthropic = {
@@ -21,6 +22,7 @@ in
       prompts.api-key.type = "hidden";
       prompts.api-key.persist = true;
       share = true;
+      files.api-key.owner = "moritz";
     };
   };
 }
diff --git a/modules/moritz/profiles/personal_calendar.nix b/modules/moritz/profiles/personal_calendar.nix
index bf6dab2..1b0ed15 100644
--- a/modules/moritz/profiles/personal_calendar.nix
+++ b/modules/moritz/profiles/personal_calendar.nix
@@ -52,6 +52,7 @@ in
       prompts.password.type = "hidden";
       prompts.password.persist = true;
       share = true;
+      files.password.owner = "moritz";
     };
   };
 }
diff --git a/modules/moritz/profiles/personal_contacts.nix b/modules/moritz/profiles/personal_contacts.nix
index 18534e5..497297e 100644
--- a/modules/moritz/profiles/personal_contacts.nix
+++ b/modules/moritz/profiles/personal_contacts.nix
@@ -50,6 +50,7 @@ in
       prompts.password.type = "hidden";
       prompts.password.persist = true;
       share = true;
+      files.password.owner = "moritz";
     };
   };
 }
diff --git a/modules/moritz/profiles/personal_mail.nix b/modules/moritz/profiles/personal_mail.nix
index e846efd..f1b6c9d 100644
--- a/modules/moritz/profiles/personal_mail.nix
+++ b/modules/moritz/profiles/personal_mail.nix
@@ -71,6 +71,7 @@ in
       prompts.password.type = "hidden";
       prompts.password.persist = true;
       share = true;
+      files.password.owner = "moritz";
     };
   };
 }
diff --git a/modules/moritz/programs/aider.nix b/modules/moritz/programs/aider.nix
index dd1abea..49b3b62 100644
--- a/modules/moritz/programs/aider.nix
+++ b/modules/moritz/programs/aider.nix
@@ -11,7 +11,7 @@ let
   wrapped = pkgs.writeShellApplication {
     name = "aider";
     text = ''
-      aider --openai-api-key "$(cat /run/agenix/openai)" --anthropic-api-key "$(cat /run/agenix/anthropic)" --no-attribute-author --no-attribute-committer "$@"
+      aider --openai-api-key "$(cat ${config.clan.core.vars.generators.moritz-openai.files.api-key.path})" --anthropic-api-key "$(cat ${config.clan.core.vars.generators.moritz-anthropic.files.api-key.path})" --no-attribute-author --no-attribute-committer "$@"
     '';
     runtimeInputs = [ cfg.package ];
   };