diff -r 99a34860c105 -r d938228c382e src/server/daemon/event.c
--- a/src/server/daemon/event.c	Wed Nov 02 19:19:01 2022 +0100
+++ b/src/server/daemon/event.c	Sun Nov 06 15:53:32 2022 +0100
@@ -26,12 +26,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <ucx/map.h>
+#include <cx/hash_map.h>
 #include "../util/atomic.h"
 
 #include "event.h"
 
-UcxMap *event_handler_map = NULL;
+CxMap *event_handler_map = NULL;
 int numevhandlers = 0;
 
 EVHandler *default_event_handler = NULL;
@@ -40,11 +40,13 @@
 
 int create_event_handler(EventHandlerConfig *cfg) {
     if(event_handler_map == NULL) {
-        event_handler_map = ucx_map_new(16);
+        event_handler_map = cxHashMapCreate(cxDefaultAllocator, 16);
     }
     
+    CxHashKey key = cx_hash_key_bytes((const unsigned char*)cfg->name.ptr, cfg->name.length);
+    
     /* if the event handler already exists, we don't modify it */
-    if(ucx_map_sstr_get(event_handler_map, cfg->name)) {
+    if(cxMapGet(event_handler_map, key)) {
         /* TODO: log message */
         /* TODO: set reload status */
         return 1;
@@ -64,7 +66,7 @@
         default_event_handler = e;
     }
     
-    int ret = ucx_map_sstr_put(event_handler_map, cfg->name, e);
+    int ret = cxMapPut(event_handler_map, key, e);
     if(ret == 0) {
         last_handler_c = e;
         numevhandlers++;
@@ -88,7 +90,7 @@
     }
     
     EventHandlerConfig cfg;
-    cfg.name = SC("default");
+    cfg.name = cx_str("default");
     cfg.nthreads = 1;
     cfg.isdefault = 1;
     
@@ -100,8 +102,8 @@
     return default_event_handler;
 }
 
-EVHandler* get_event_handler(char *name) {
-    return ucx_map_cstr_get(event_handler_map, name);
+EVHandler* get_event_handler(const char *name) {
+    return cxMapGet(event_handler_map, cx_hash_key_str(name));
 }
 
 EventHandler* ev_instance(EVHandler *ev) {