Index: /waeup/branches/ulif-rewrite/src/waeup/university/faculty.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/university/faculty.py	(revision 4247)
+++ /waeup/branches/ulif-rewrite/src/waeup/university/faculty.py	(revision 4248)
@@ -9,7 +9,4 @@
     grok.implements(IFaculty)
 
-    # A simple counter for ids.
-    next_id = 0L
-    
     def __init__(self,
                  title=u'Unnamed Faculty',
@@ -24,10 +21,5 @@
         if not IDepartment.providedBy(department):
             raise TypeError('Facultues contain only IDepartment instances')
-        id = str(self.next_id)
-        self[id] = department
-        while str(self.next_id) in self.keys():
-            # Look for next unused int...
-            self.next_id += 1
-        return id
+        self[department.code] = department
 
     def clear(self):
@@ -35,5 +27,4 @@
         for key in keys:
             del self[key]
-        next_id = 0L
 
         
