diff --git a/src/client.cpp b/src/client.cpp
index b89b8ee..fddcb09 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -71,15 +71,13 @@ static int setParams(int argc, char** argv, T& request) {
 }
 
 int main(int argc, char** argv) {
-    // TODO: pass this through an enviroment variable set by laminard
-    const char* address = "unix:\0laminar";
-
     if(argc < 2) {
         fprintf(stderr, "Usage: %s <command> [parameters...]\n", argv[0]);
         return EINVAL;
     }
 
     int ret = 0;
+    const char* address = getenv("LAMINAR_HOST") ?: "unix-abstract:laminar";
 
     capnp::EzRpcClient client(address);
     LaminarCi::Client laminar = client.getMain<LaminarCi>();
diff --git a/src/laminar.cpp b/src/laminar.cpp
index a5d36dc..9e73535 100644
--- a/src/laminar.cpp
+++ b/src/laminar.cpp
@@ -55,7 +55,7 @@ template<> Json& Json::set(const char* key, time_t value) { String(key); Int64(v
 
 namespace {
 // Default values when none were supplied in $LAMINAR_CONF_FILE (/etc/laminar.conf)
-constexpr const char* INTADDR_RPC_DEFAULT = "unix:\0laminar";
+constexpr const char* INTADDR_RPC_DEFAULT = "unix-abstract:laminar";
 constexpr const char* INTADDR_HTTP_DEFAULT = "*:8080";
 constexpr const char* ARCHIVE_URL_DEFAULT = "/archive";
 }