diff --git a/flake.lock b/flake.lock
index 4a5644c..6da5ebe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,7 +20,7 @@
         "type": "github"
       }
     },
-    "emacs-config": {
+    "emacsConfig": {
       "inputs": {
         "home-manager": [
           "home-manager"
@@ -78,7 +78,7 @@
     "root": {
       "inputs": {
         "darwin": "darwin",
-        "emacs-config": "emacs-config",
+        "emacsConfig": "emacsConfig",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs"
       }
diff --git a/flake.nix b/flake.nix
index 7196818..63b9053 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,11 +1,18 @@
 {
   inputs = {
-    darwin.inputs.nixpkgs.follows = "nixpkgs";
-    darwin.url = "github:lnl7/nix-darwin/";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.url = "github:nix-community/home-manager/";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    emacs-config = {
+
+    darwin = {
+      url = "github:lnl7/nix-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    home-manager = {
+      url = "github:nix-community/home-manager/";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    emacsConfig = {
       url = "path:./flakes/emacs";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
@@ -24,7 +31,7 @@
           email = "tobias.ostner@gmail.com";
           hostname = "TobBook";
           extraHomeManagerModules = [
-            inputs.emacs-config.homeManagerModules.aarch64-darwin
+            inputs.emacsConfig.homeManagerModules.aarch64-darwin
           ];
         };
         TobWork = darwin-system {
@@ -32,6 +39,9 @@
           username = "tostner";
           email = "tobias.ostner@jambit.com";
           hostname = "laptop1042";
+          extraHomeManagerModules = [
+            inputs.emacsConfig.homeManagerModules.aarch64-darwin
+          ];
         };
       };
     };
diff --git a/flakes/emacs/home.nix b/flakes/emacs/home.nix
index 2f7b3e9..1b95cae 100644
--- a/flakes/emacs/home.nix
+++ b/flakes/emacs/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   home.file.".emacs.d/early-init.el".source = ./config/early-init.el;
   home.file.".emacs.d/tree-sitter/libtree-sitter-swift.dylib".source = ./config/tree-sitter/libtree-sitter-swift.dylib;