diff --git a/flake.lock b/flake.lock
index c8aa4ac..f81e1d7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -89,11 +89,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761597516,
-        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
+        "lastModified": 1762233356,
+        "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
+        "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8",
         "type": "github"
       },
       "original": {
@@ -113,11 +113,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761078382,
-        "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=",
+        "lastModified": 1762274591,
+        "narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=",
         "owner": "pjones",
         "repo": "plasma-manager",
-        "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c",
+        "rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 84c8175..833aa7e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,6 +35,7 @@
       "luna"
       "terra"
       "solis"
+      "artemis"
     ];
 
     systems = [
diff --git a/machines/artemis/configuration.nix b/machines/artemis/configuration.nix
new file mode 100644
index 0000000..9470c45
--- /dev/null
+++ b/machines/artemis/configuration.nix
@@ -0,0 +1,13 @@
+{...}: {
+  imports = [
+    ./hardware-configuration.nix
+    ./modules.nix
+  ];
+
+  horseman.username = "horseman";
+  horseman.stateVersion = "24.11";
+
+  networking.hostName = "artemis";
+
+  networking.extraHosts = "127.0.0.1 koala.rails.local";
+}
diff --git a/machines/artemis/modules.nix b/machines/artemis/modules.nix
new file mode 100644
index 0000000..f910f2a
--- /dev/null
+++ b/machines/artemis/modules.nix
@@ -0,0 +1,60 @@
+{...}: {
+  imports = [
+    ../../modules
+  ];
+
+  config.horseman = {
+    catppuccin.flavor = "macchiato";
+
+    users.default.enable = true;
+
+    base = {
+      nix.enable = true;
+      locale.enable = true;
+      secrets.enable = true;
+    };
+
+    boot = {
+      loader.systemd.enable = true;
+      greeter.greetd.enable = true;
+      greeter.greetd.session = "Hyprland";
+    };
+
+    wm.hyprland = {
+      enable = true;
+
+      config = {
+        monitors.displays = [
+          {
+            output = "eDP-1";
+            x = 0;
+            y = 0;
+            bar = "top";
+          }
+        ];
+        monitors.bindWorkspaces = "interlaced";
+      };
+    };
+
+    hardware = {
+      audio.enable = true;
+      bluetooth.enable = true;
+      wifi.enable = true;
+    };
+
+    network = {
+      ssh.enable = true;
+      syncthing.enable = true;
+      tailscale.enable = true;
+    };
+
+    apps = {
+      dev.enable = true;
+      visual.enable = true;
+      terminal = {
+        enable = true;
+        zsh.enable = true;
+      };
+    };
+  };
+}