Over tired baby

Hi Moms,
Need a little bit of advice. Lately, it's been so hard to get Freddie to nap. He was doing great until about two weeks ago. I take him to the office with me, and he has a really hard time napping here. I keep it darker and quieter for the most part. He rubs his eyes, yawns and his eyes get heavy, but he puts up such a fuss at times. I finally got him to sleep, but it was only after he tired himself out from crying so much. Normally, he is such a happy baby. It's when he gets over tired that it gets really difficult. Any ideas of what I could try? I have tried numerous things, but want to see what other moms have to say and what might have worked for them. Any advice would be so appreciated. :)

    Aveeno baby calming and comfort lotion then play some soft classical music and something familiar to sooth him.
    About Kristin
    Current: Tempe, Arizona
    Birth: December 10
    On Moms.com since: Feb 4, 2014
    I am a social worker for individuals with developmental disabilities. I am married to the love of my life. Gave birth to our beautiful son on April 17. Life is amazing!! :)