I found the solution after a few more hours on google. If X says the nvidia module can't be loaded, when lsmod says it is, then nvidia-glx probably isn't installed. For some reason apt-get dist-upgrade removed nvidia-glx. I suppose that's what I get for running "sleep 8h; apt-get -y dist-upgrade".