diff --git a/devices/inkvine/options.nix b/devices/inkvine/options.nix
index 33dd305..e08e6e2 100644
--- a/devices/inkvine/options.nix
+++ b/devices/inkvine/options.nix
@@ -3,7 +3,7 @@
     apps.enable = true;
     niri.enable = true;
     extraLayout.enable = true;
-    fonts.enbale = true;
+    fonts.enable = true;
     secureboot.enable = true;
     containers.enable = true;
     networkmanager.enable = true;
diff --git a/flake.lock b/flake.lock
index 600b65a..ae99e90 100644
--- a/flake.lock
+++ b/flake.lock
@@ -311,21 +311,6 @@
         "type": "github"
       }
     },
-    "nixos-facter-modules": {
-      "locked": {
-        "lastModified": 1736931726,
-        "narHash": "sha256-aY55yiifyo1XPPpbpH0kWlV1g2dNGBlx6622b7OK8ks=",
-        "owner": "numtide",
-        "repo": "nixos-facter-modules",
-        "rev": "fa11d87b61b2163efbb9aed7b7a5ae0299e5ab9c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nixos-facter-modules",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1738638143,
@@ -475,7 +460,6 @@
         "lanzaboote": "lanzaboote",
         "niri": "niri",
         "nix-alien": "nix-alien",
-        "nixos-facter-modules": "nixos-facter-modules",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "nur": "nur"
diff --git a/flake.nix b/flake.nix
index 277b8ea..2dbfb19 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,10 +35,6 @@
     nix-alien = {
       url = "github:thiagokokada/nix-alien";
     };
-
-    nixos-facter-modules = {
-      url = "github:numtide/nixos-facter-modules";
-    };
   };
 
   outputs = inputs: import ./outputs.nix inputs;
diff --git a/options.nix b/options.nix
index 1ff4b47..7fee039 100644
--- a/options.nix
+++ b/options.nix
@@ -4,7 +4,7 @@
 in {
   options = {
     conf = {
-      ssh.enbale = mkEnableOption "Install my public key to allow accessing this machine via ssh.";
+      ssh.enable = mkEnableOption "Install my public key to allow accessing this machine via ssh.";
       apps.enable = mkEnableOption "Enable complete configuration for end-user machine.";
       niri.enable = mkEnableOption "Enable niri compositor.";
       vm.enable = mkEnableOption "Enable VM related configuration.";
diff --git a/outputs.nix b/outputs.nix
index 2c24cde..006c91a 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -1,4 +1,13 @@
-{ nixpkgs,  home-manager, nixos-hardware, disko, niri, lanzaboote, nixos-facter-modules, ... }@inputs: {
+{ nixpkgs,  home-manager, nixos-hardware, disko, niri, lanzaboote, ... }@inputs: let
+  modules = [
+      ./options.nix
+      ./modules
+      niri.nixosModules.niri
+      home-manager.nixosModules.home-manager
+      lanzaboote.nixosModules.lanzaboote
+      disko.nixosModules.disko
+  ];
+in {
   nixosConfigurations = {
     # Framework Laptop 13
     # AMD Ryzen 5 7640U
@@ -10,14 +19,9 @@
         inherit inputs;
       };
       modules = [
-        ./options.nix
         ./devices/inkvine
-        ./modules
-        niri.nixosModules.niri
-        home-manager.nixosModules.home-manager
-        lanzaboote.nixosModules.lanzaboote
         nixos-hardware.nixosModules.framework-13-7040-amd
-      ];
+      ] ++ modules;
     };
 
     ellaca = nixpkgs.lib.nixosSystem {
@@ -26,11 +30,8 @@
         inherit inputs;
       };
       modules = [
-        ./options.nix
         ./devices/ellaca
-        ./modules
-        disko.nixosModules.disko
-      ];
+      ] ++ modules;
     };
   };
 }