diff --git a/hosts/fenixpc/default.nix b/hosts/fenixpc/default.nix
index e24c2f1..7396a0c 100644
--- a/hosts/fenixpc/default.nix
+++ b/hosts/fenixpc/default.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  pkgsStable,
   quirks,
   ...
 }:
@@ -45,13 +44,6 @@ in
     printing.ricoh.enable = true;
     calibre-web = {
       enable = true;
-      listen.port = 8091;
-      listen.ip = "0.0.0.0";
-      package = pkgsStable.calibre-web;
-      options = {
-        enableBookUploading = true;
-        enableBookConversion = true;
-      };
       user = "fenix";
     };
   };
diff --git a/modules/sys/calibre-web.nix b/modules/sys/calibre-web.nix
new file mode 100644
index 0000000..4f769fb
--- /dev/null
+++ b/modules/sys/calibre-web.nix
@@ -0,0 +1,15 @@
+{ pkgsStable, lib, ... }:
+{
+  services = {
+    calibre-web = {
+      listen.port = lib.mkDefault 8091;
+      listen.ip = lib.mkDefault "0.0.0.0";
+      package = pkgsStable.calibre-web;
+      options = {
+        enableBookUploading = true;
+        enableBookConversion = true;
+      };
+      user = lib.mkDefault "books";
+    };
+  };
+}