diff --git a/conts/posix/mm0/include/arch-arm/mm.h b/conts/posix/mm0/include/arch-arm/mm.h
index 54fbe66..6224afc 100644
--- a/conts/posix/mm0/include/arch-arm/mm.h
+++ b/conts/posix/mm0/include/arch-arm/mm.h
@@ -1,14 +1,11 @@
 #ifndef __INITTASK_ARCH_MM_H__
 #define __INITTASK_ARCH_MM_H__
 
-#include <arch/offsets.h>
 #include <l4/macros.h>
 #include <l4/types.h>
 #include INC_GLUE(memory.h)
 #include <vm_area.h>
 
-#define INITTASK_ADDR(x)	((x >= INITTASK_AREA_START) && (x < INITTASK_AREA_END))
-
 struct fault_data;
 unsigned int vm_prot_flags(pte_t pte);
 void set_generic_fault_params(struct fault_data *fault);
diff --git a/conts/posix/mm0/include/arch-arm/offsets.h b/conts/posix/mm0/include/arch-arm/offsets.h
deleted file mode 100644
index 78cdfda..0000000
--- a/conts/posix/mm0/include/arch-arm/offsets.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __INITTASK_ARCH_OFFSETS_H__
-#define __INITTASK_ARCH_OFFSETS_H__
-
-#define INITTASK_AREA_START	0xE0000000
-#define INITTASK_AREA_END	0xF0000000
-
-#define INITTASK_OFFSET		INITTASK_AREA_START
-
-#endif
diff --git a/conts/posix/mm0/mm/init.c b/conts/posix/mm0/mm/init.c
index df1a0bb..44e2af2 100644
--- a/conts/posix/mm0/mm/init.c
+++ b/conts/posix/mm0/mm/init.c
@@ -113,8 +113,8 @@ int pager_setup_task(void)
 	task->map_end = PAGER_MMAP_END;
 
 	/* Task's total map boundaries */
-	task->start = task->text_start;
-	task->end = 0xF0000000;
+	task->start = __pfn_to_addr(cont_mem_regions.pager->start);
+	task->end = __pfn_to_addr(cont_mem_regions.pager->end);
 
 	/*
 	 * Map all regions as anonymous (since no real
@@ -142,7 +142,8 @@ int pager_setup_task(void)
 	 * microkernel for this pager. Ensure that we also get
 	 * the same from our internal utcb bookkeeping.
 	 */
-	BUG_ON(task->utcb_address != __pfn_to_addr(cont_mem_regions.utcb->start));
+	BUG_ON(task->utcb_address !=
+	       __pfn_to_addr(cont_mem_regions.utcb->start));
 
 	/* Pager must prefault its utcb */
 	prefault_page(task, task->utcb_address,
diff --git a/conts/posix/mm0/mm/memory.c b/conts/posix/mm0/mm/memory.c
index b45e17e..f018ae1 100644
--- a/conts/posix/mm0/mm/memory.c
+++ b/conts/posix/mm0/mm/memory.c
@@ -57,10 +57,11 @@ static struct pager_virtual_address_id_pool {
  */
 int pager_address_pool_init(void)
 {
-		address_pool_init_with_idpool(&pager_vaddr_pool,
-			  	      (struct id_pool *)
-				      &pager_virtual_address_id_pool,
-				      PAGER_MMAP_END, 0xF0000000);
+	address_pool_init_with_idpool(&pager_vaddr_pool,
+		  	      	      (struct id_pool *)
+			      	      &pager_virtual_address_id_pool,
+				      PAGER_MMAP_END,
+				      __pfn_to_addr(cont_mem_regions.pager->end));
 	return 0;
 }