a couple of lockdep fixes

This was triggering with vstart.sh .. -o 'lockdep = true'.  Reverts a commit yesterday that disabled the id assignment (which is important!).