diff --git a/.gitmodules b/.gitmodules
index 5ec429f..04c430b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -48,4 +48,4 @@
 	branch = master
 [submodule "vendor/libchat"]
 	path = vendor/libchat
-	url = git@github.com:logos-messaging/libchat.git
+	url = https://github.com/logos-messaging/libchat.git
diff --git a/src/chat/client.nim b/src/chat/client.nim
index 41096fb..e9de37f 100644
--- a/src/chat/client.nim
+++ b/src/chat/client.nim
@@ -44,7 +44,7 @@ type Conversation* = object
 
 
 proc id*(self: Conversation): string =
-  return "TODO"
+  return self.convoId
 
 
 type