diff --git a/flake.nix b/flake.nix
index a5a99d0..c882fb1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,6 +46,24 @@
             ];
          };
 
+         "edi" = nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            modules = [
+               # Add Disko for disk management
+               disko.nixosModules.disko
+               ./disko-config.nix
+               ./edi.nix
+               ./configuration.nix
+               ./hardware-configuration.nix
+               home-manager.nixosModules.home-manager
+               {
+                  home-manager.useGlobalPkgs = true;
+                  home-manager.useUserPackages = true;
+                  home-manager.users.aaronh = import ./home.nix;
+               }
+            ];
+         };
+
          "garrus" = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
             modules = [
diff --git a/hosts/x86_64/EDI/configuration.nix b/hosts/x86_64/EDI/configuration.nix
new file mode 100644
index 0000000..77995eb
--- /dev/null
+++ b/hosts/x86_64/EDI/configuration.nix
@@ -0,0 +1,34 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports =
+    [
+        ./hardware-configuration.nix
+    ];
+
+  boot.kernelParams = [ "console=tty0" ];
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+
+  nix.settings.extra-platforms = [ "aarch64-linux" ];  
+  nix.buildMachines = [{ 
+     hostName = "localhost";
+     systems = ["x86_64-linux"
+                "aarch64-linux"
+                "x86_64-darwin"
+                "aarch64-darwin"];
+     supportedFeatures = ["kvm" "nixos-test" "big-parallel" "benchmark"];
+     maxJobs = 8;
+  }];
+
+  networking.hostName = "EDI";
+  networking.firewall = {
+    enable = true;
+    allowedTCPPorts = [ 80 443 ];
+  };
+
+  # Enable the OpenSSH daemon.
+  services.openssh = {
+    permitRootLogin = "no";
+  };
+
+}