diff --git a/degesch.c b/degesch.c
index 78a5f66..6bceb2e 100644
--- a/degesch.c
+++ b/degesch.c
@@ -2392,7 +2392,7 @@ static void
 formatter_parse_nick (struct formatter *self, char *s)
 {
 	char *nick = irc_cut_nickname (s);
-	int color = str_map_hash (nick, strlen (nick)) % 8;
+	int color = siphash_wrapper (nick, strlen (nick)) % 8;
 
 	// We always use the default color for ourselves
 	if (self->s && irc_is_this_us (self->s, nick))
diff --git a/kike.c b/kike.c
index f24dbf2..738365e 100644
--- a/kike.c
+++ b/kike.c
@@ -3951,6 +3951,9 @@ daemonize (struct server_context *ctx)
 int
 main (int argc, char *argv[])
 {
+	// Need to call this first as all string maps depend on it
+	siphash_wrapper_randomize ();
+
 	static const struct opt opts[] =
 	{
 		{ 'd', "debug", NULL, 0, "run in debug mode (do not daemonize)" },
diff --git a/liberty b/liberty
index 0058c1f..0270860 160000
--- a/liberty
+++ b/liberty
@@ -1 +1 @@
-Subproject commit 0058c1f457a954fbdfc63f458fa00c3c5a700f69
+Subproject commit 02708608a97d021576fd08b39c400a27a590c999