Turns out I was getting clobbered by debian bug #332548. Downgrading xserver-xorg to version 6.8.2.dfsg.1-11 fixed the problem.