diff --git a/equeue.c b/equeue.c
index 7769729..9b72c24 100644
--- a/equeue.c
+++ b/equeue.c
@@ -17,18 +17,24 @@ int equeue_create(equeue_t *q, size_t size) {
     }
 
     int err = equeue_create_inplace(q, size, buffer);
-    q->buffer = buffer;
+    q->allocated = buffer;
     return err;
 }
 
 int equeue_create_inplace(equeue_t *q, size_t size, void *buffer) {
+    q->buffer = buffer;
+    q->allocated = 0;
+
+    q->npw2 = 0;
+    for (unsigned s = size; s; s >>= 1) {
+        q->npw2++;
+    }
+
+    q->chunks = 0;
     q->slab.size = size;
     q->slab.data = buffer;
-    q->chunks = 0;
-    q->buffer = 0;
 
     q->queue = 0;
-    q->next_id = 42;
     q->break_ = (struct equeue_event){
         .id = 0,
         .period = -1,
@@ -45,7 +51,7 @@ int equeue_create_inplace(equeue_t *q, size_t size, void *buffer) {
         return err;
     }
 
-    err = equeue_mutex_create(&q->freelock);
+    err = equeue_mutex_create(&q->memlock);
     if (err < 0) {
         return err;
     }
@@ -60,21 +66,18 @@ void equeue_destroy(equeue_t *q) {
         equeue_dealloc(q, e+1);
     }
 
-    equeue_mutex_destroy(&q->freelock);
+    equeue_mutex_destroy(&q->memlock);
     equeue_mutex_destroy(&q->queuelock);
     equeue_sema_destroy(&q->eventsema);
-    free(q->buffer);
+    free(q->allocated);
 }
 
-// equeue allocation functions
-static void *equeue_mem_alloc(equeue_t *q, size_t size) {
-    size = size + sizeof(unsigned);
-    size = (size + sizeof(unsigned)-1) & ~(sizeof(unsigned)-1);
-    if (size < sizeof(struct equeue_chunk)) {
-        size = sizeof(struct equeue_chunk);
-    }
+// equeue chunk allocation functions
+static struct equeue_event *equeue_mem_alloc(equeue_t *q, size_t size) {
+    size += sizeof(struct equeue_event);
+    size = (size + sizeof(void*)-1) & ~(sizeof(void*)-1);
 
-    equeue_mutex_lock(&q->freelock);
+    equeue_mutex_lock(&q->memlock);
 
     for (struct equeue_chunk **p = &q->chunks; *p; p = &(*p)->nchunk) {
         if ((*p)->size >= size) {
@@ -85,8 +88,14 @@ static void *equeue_mem_alloc(equeue_t *q, size_t size) {
             } else {
                 *p = c->nchunk;
             }
-            equeue_mutex_unlock(&q->freelock);
-            return (unsigned *)c + 1;
+
+            c->id += 1;
+            if (c->id >> (8*sizeof(int)-1 - q->npw2)) {
+                c->id = 1;
+            }
+
+            equeue_mutex_unlock(&q->memlock);
+            return (struct equeue_event *)c;
         }
     }
 
@@ -95,18 +104,20 @@ static void *equeue_mem_alloc(equeue_t *q, size_t size) {
         q->slab.data += size;
         q->slab.size -= size;
         c->size = size;
-        equeue_mutex_unlock(&q->freelock);
-        return (unsigned *)c + 1;
+        c->id = 1;
+
+        equeue_mutex_unlock(&q->memlock);
+        return (struct equeue_event *)c;
     }
 
-    equeue_mutex_unlock(&q->freelock);
+    equeue_mutex_unlock(&q->memlock);
     return 0;
 }
 
-static void equeue_mem_dealloc(equeue_t *q, void *e) {
-    struct equeue_chunk *c = (struct equeue_chunk *)((unsigned *)e - 1);
+static void equeue_mem_dealloc(equeue_t *q, struct equeue_event *e) {
+    struct equeue_chunk *c = (struct equeue_chunk *)e;
 
-    equeue_mutex_lock(&q->freelock);
+    equeue_mutex_lock(&q->memlock);
 
     struct equeue_chunk **p = &q->chunks;
     while (*p && (*p)->size < c->size) {
@@ -121,27 +132,17 @@ static void equeue_mem_dealloc(equeue_t *q, void *e) {
         c->nchunk = *p;
     }
     *p = c;
-    
-    equeue_mutex_unlock(&q->freelock);
-}
 
-// event allocation functions
-static inline int equeue_next_id(equeue_t *q) {
-    int id = q->next_id++;
-    if (q->next_id < 0) {
-        q->next_id = 42;
-    }
-    return id;
+    equeue_mutex_unlock(&q->memlock);
 }
 
+// equeue allocation functions
 void *equeue_alloc(equeue_t *q, size_t size) {
-    struct equeue_event *e = equeue_mem_alloc(q,
-            sizeof(struct equeue_event) + size);
+    struct equeue_event *e = equeue_mem_alloc(q, size);
     if (!e) {
         return 0;
     }
 
-    e->id = equeue_next_id(q);
     e->target = 0;
     e->period = -1;
     e->dtor = 0;
@@ -172,24 +173,23 @@ static void equeue_enqueue(equeue_t *q, struct equeue_event *e, unsigned ms) {
         p = &(*p)->next;
     }
     
+    e->ref = p;
     e->next = *p;
+    if (*p) {
+        (*p)->ref = &e->next;
+    }
     *p = e;
 }
 
-static struct equeue_event *equeue_dequeue(equeue_t *q, int id) {
-    for (struct equeue_event **p = &q->queue; *p; p = &(*p)->next) {
-        if ((*p)->id == id) {
-            struct equeue_event *e = *p;
-            *p = (*p)->next;
-            return e;
-        }
+static void equeue_dequeue(equeue_t *q, struct equeue_event *e) {
+    if (e->next) {
+        e->next->ref = e->ref;
     }
-
-    return 0;
+    *e->ref = e->next;
 }
 
 static int equeue_post_in(equeue_t *q, struct equeue_event *e, int ms) {
-    int id = e->id;
+    int id = (e->id << q->npw2) | ((unsigned char *)e - q->buffer);
     if (ms < 0) {
         equeue_dealloc(q, e+1);
         return id;
@@ -211,13 +211,19 @@ int equeue_post(equeue_t *q, void (*cb)(void*), void *p) {
 }
 
 void equeue_cancel(equeue_t *q, int id) {
+    struct equeue_event *e = (struct equeue_event *)
+            &q->buffer[id & ((1 << q->npw2)-1)];
+
     equeue_mutex_lock(&q->queuelock);
-    struct equeue_event *e = equeue_dequeue(q, id);
+    if (e->id != id >> q->npw2) {
+        equeue_mutex_unlock(&q->queuelock);
+        return;
+    }
+
+    equeue_dequeue(q, e);
     equeue_mutex_unlock(&q->queuelock);
 
-    if (e) {
-        equeue_dealloc(q, e+1);
-    }
+    equeue_dealloc(q, e+1);
 }
 
 void equeue_break(equeue_t *q) {
@@ -248,6 +254,7 @@ void equeue_dispatch(equeue_t *q, int ms) {
             }
 
             struct equeue_event *e = q->queue;
+            e->id += 1;
             q->queue = e->next;
 
             if (e->period >= 0) {
diff --git a/equeue.h b/equeue.h
index 2f35354..f0217e4 100644
--- a/equeue.h
+++ b/equeue.h
@@ -21,12 +21,15 @@ extern "C" {
 
 // Definition of the minimum size of an event
 // This size fits the events created in the event_call set of functions.
-#define EQUEUE_EVENT_SIZE (sizeof(struct equeue_event) + 3*sizeof(void*))
+#define EQUEUE_EVENT_SIZE (sizeof(struct equeue_event) + 2*sizeof(void*))
 
 // Event/queue structures
 struct equeue_event {
-    struct equeue_event *next;
+    unsigned size;
     int id;
+    struct equeue_event *next;
+    struct equeue_event **ref;
+
     unsigned target;
     int period;
     void (*dtor)(void *);
@@ -37,11 +40,14 @@ struct equeue_event {
 
 typedef struct equeue {
     struct equeue_event *queue;
-    int next_id;
 
-    void *buffer;
+    unsigned char *buffer;
+    unsigned npw2;
+    void *allocated;
+
     struct equeue_chunk {
         unsigned size;
+        int id;
         struct equeue_chunk *next;
         struct equeue_chunk *nchunk;
     } *chunks;
@@ -54,7 +60,7 @@ typedef struct equeue {
 
     equeue_sema_t eventsema;
     equeue_mutex_t queuelock;
-    equeue_mutex_t freelock;
+    equeue_mutex_t memlock;
 } equeue_t;
 
 
diff --git a/tests/prof.c b/tests/prof.c
index 7d6e282..0afbff9 100644
--- a/tests/prof.c
+++ b/tests/prof.c
@@ -185,7 +185,7 @@ void equeue_post_many_prof(int count) {
     struct equeue q;
     equeue_create(&q, count*EQUEUE_EVENT_SIZE);
 
-    for (int i = 0; i < count; i++) {
+    for (int i = 0; i < count-1; i++) {
         equeue_call(&q, no_func, 0);
     }
 
@@ -224,7 +224,7 @@ void equeue_post_future_many_prof(int count) {
     struct equeue q;
     equeue_create(&q, count*EQUEUE_EVENT_SIZE);
 
-    for (int i = 0; i < count; i++) {
+    for (int i = 0; i < count-1; i++) {
         equeue_call(&q, no_func, 0);
     }
 
@@ -293,7 +293,7 @@ void equeue_cancel_many_prof(int count) {
     struct equeue q;
     equeue_create(&q, count*EQUEUE_EVENT_SIZE);
 
-    for (int i = 0; i < count; i++) {
+    for (int i = 0; i < count-1; i++) {
         equeue_call(&q, no_func, 0);
     }