diff --git a/nixos/socrates/default.nix b/nixos/socrates/default.nix
index 389112385..f638b83d6 100644
--- a/nixos/socrates/default.nix
+++ b/nixos/socrates/default.nix
@@ -50,13 +50,6 @@ in {
       shell = pkgs.fish;
     };
 
-    users.buildkite-agent = {
-      # TODO: Consider setting this to `false` when you better understand the
-      # implications.
-      isNormalUser = true;
-      extraGroups = [ "git" ];
-    };
-
     users.git = {
       group = "git";
       isNormalUser = false;
@@ -115,6 +108,13 @@ in {
     rootUrl = "https://git.wpcarro.dev/";
   };
 
+  services.buildkite-agents = {
+    socrates = {
+      enable = true;
+      tokenPath = "/etc/secrets/buildkite-agent-token";
+    };
+  };
+
   # systemd.services.monzo-token-server = {
   #   enable = true;
   #   description = "Ensure my Monzo access token is valid";