diff --git a/hosts/juri/host.nix b/hosts/juri/host.nix
index 9ca4456..96c2110 100644
--- a/hosts/juri/host.nix
+++ b/hosts/juri/host.nix
@@ -65,11 +65,6 @@ in {
     server.domain = "ginko.woach.me";
   };
 
-  fava = {
-    enable = true;
-    port = "5128";
-  };
-
   syncthing = {
     enable = true;
     devices = {
diff --git a/nixosModules/automatic/default.nix b/nixosModules/automatic/default.nix
index 2f80ace..7a680f6 100644
--- a/nixosModules/automatic/default.nix
+++ b/nixosModules/automatic/default.nix
@@ -1,13 +1,12 @@
 { config, pkgs, lib, hostname, usernameList, ... }:
 
 {
-  options.system = {
-    timezone = lib.mkOption { default = "America/Los_Angeles"; };
-    extraFonts = lib.mkOption { default = []; };
-    extraPkgs = lib.mkOption { default = []; };
-    isNonEFI = lib.mkEnableOption 
+  options = {
+    system.timezone = lib.mkOption { default = "America/Los_Angeles"; };
+    system.extraFonts = lib.mkOption { default = []; };
+    system.isNonEFI = lib.mkEnableOption 
       "Enable if you are running a non-EFI system";
-    users.bigWheels = lib.mkOption { default = []; };
+    system.users.bigWheels = lib.mkOption { default = []; };
   };
   
   config = lib.mkMerge [
@@ -34,7 +33,7 @@
         git
         neovim
         xdg-user-dirs
-      ] ++ config.system.extraPkgs;
+      ];
 
       # XDG Compliance
       nix.settings.use-xdg-base-directories = true;
diff --git a/nixosModules/services/fava/service.nix b/nixosModules/services/fava/service.nix
deleted file mode 100644
index 12ea6c2..0000000
--- a/nixosModules/services/fava/service.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  options.fava = {
-    enable = lib.mkEnableOption "Enables fava double entry accounting";
-    ledgerFile = lib.mkOption { default = "/var/lib/fava/ledger.beancount"; };
-    port = lib.mkOption { default = "5000"; };
-    host = lib.mkOption { default = "localhost"; };
-  };
-
-  config = lib.mkIf config.fava.enable {
-    systemd.services.fava = {
-      description = "Fava";
-      after = [ "network-online.target" ];
-      wants = [ "network-online.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.fava}/bin/fava --port ${config.fava.port} --host ${config.fava.host} ${config.fava.ledgerFile}";
-        Type = "simple";
-        User = "fava";
-        Group = "fava";
-        Restart = "on-failure";
-        RestartSec = "5s";
-        NoNewPrivileges = true;
-        PrivateTmp = true;
-        PrivateDevices = true;
-        ProtectHome = true;
-        ProtectSystem = "full";
-        ReadWriteDirectories = "/var/lib/fava";
-      };
-    };
-
-    users.users.fava = {
-      home = "/var/lib/fava";
-      createHome = true;
-      isSystemUser = true;
-      group = "fava";
-    };
-    users.groups.fava = {};
-
-    system.extraPkgs = [
-      pkgs.beancount
-    ];
-  };
-}