diff --git a/flake.nix b/flake.nix
index fb166fa..0d2df58 100755
--- a/flake.nix
+++ b/flake.nix
@@ -121,6 +121,7 @@
             ceres = inputs.self.lib.mkLinuxSystem [
               ./systems/ceres
               ./profiles/user0
+              ./services/comfyui
               config.nixosModules.ceres
               config.nixosModules.core
               config.nixosModules.mantle
diff --git a/modules/nixos/services/comfyui/default.nix b/modules/nixos/services/comfyui/default.nix
index cb8615a..7fdc26d 100755
--- a/modules/nixos/services/comfyui/default.nix
+++ b/modules/nixos/services/comfyui/default.nix
@@ -1,55 +1,19 @@
+{ config, pkgs, ... }:
 {
-  config,
-  pkgs,
-  flake,
-  ...
-}:
-let
-  inherit (flake.config.machines.devices) ceres;
-  inherit (flake.config.services.instances) comfyui web;
-  inherit (flake.config.people) user0;
-  service = comfyui;
-  localhost = web.localhost.address1;
-in
-{
-
   services.comfyui = {
     enable = true;
-    # package = pkgs.comfyui-nvidia;
-    host = localhost;
-    user = service.name;
-    acceleration = "cuda";
-    # models = builtins.attrValues {
-    #   inherit (pkgs.nixified-ai)
-    #     models
-    #     ;
-    # };
-    # customNodes = builtins.attrValues {
-    #   inherit (comfyui.pkgs)
-    #     comfyui-gguf
-    #     comfyui-impact-pack
-    #     ;
-    # };
-  };
-  fileSystems."/var/lib/${service.name}" = {
-    device = service.paths.path0;
-    fsType = "none";
-    options = [
-      "bind"
-    ];
-    depends = [
-      ceres.storage0.mount
-    ];
-  };
-
-  systemd.tmpfiles.rules = [
-    "Z ${service.paths.path0} 755 ${service.name} ${service.name} -"
-  ];
-
-  networking = {
-    firewall = {
-      allowedTCPPorts = [
-        service.ports.port0
+    openFirewall = true;
+    host = "0.0.0.0"; # Allow external connections
+    package = pkgs.comfyuiPackages.comfyui.override {
+      extensions = with pkgs.comfyuiPackages.extensions; [
+        acly-inpaint
+        acly-tooling
+        cubiq-ipadapter-plus
+        fannovel16-controlnet-aux
+      ];
+      commandLineArgs = [
+        "--preview-method"
+        "auto"
       ];
     };
   };
diff --git a/services/comfyui/default.nix b/services/comfyui/default.nix
new file mode 100644
index 0000000..1679abd
--- /dev/null
+++ b/services/comfyui/default.nix
@@ -0,0 +1,88 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.comfyui;
+in
+{
+  imports = [ ];
+
+  options = {
+    services.comfyui = with lib; {
+      enable = mkEnableOption "ComfyUI service";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.comfyuiPackages.comfyui.override {
+          extensions = with pkgs.comfyuiPackages.extensions; [
+            # Add desired extensions here
+            # Example extensions:
+            # acly-inpaint
+            # acly-tooling
+            # cubiq-ipadapter-plus
+            # fannovel16-controlnet-aux
+          ];
+          commandLineArgs = [
+            "--preview-method"
+            "auto"
+          ];
+        };
+        description = "The ComfyUI package to use";
+      };
+
+      port = mkOption {
+        type = types.port;
+        default = 8188;
+        description = "Port to listen on";
+      };
+
+      host = mkOption {
+        type = types.str;
+        default = "127.0.0.1";
+        description = "Host to bind to";
+      };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Open ports in the firewall";
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+
+    networking.firewall = lib.mkIf cfg.openFirewall {
+      allowedTCPPorts = [ cfg.port ];
+    };
+
+    systemd.services.comfyui = {
+      description = "ComfyUI Service";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${cfg.package}/bin/comfyui --port ${toString cfg.port} --listen ${cfg.host}";
+        Restart = "on-failure";
+        User = "comfyui";
+        Group = "comfyui";
+        WorkingDirectory = "/var/lib/comfyui";
+      };
+    };
+
+    users.users.comfyui = {
+      group = "comfyui";
+      isSystemUser = true;
+      home = "/var/lib/comfyui";
+      createHome = true;
+    };
+
+    users.groups.comfyui = { };
+  };
+}